diff --git a/src/components/MainSidebar/ProgramDimensionsPanel/ProgramDimensionsFilter.js b/src/components/MainSidebar/ProgramDimensionsPanel/ProgramDimensionsFilter.js
index 386ba396f..39e815b45 100644
--- a/src/components/MainSidebar/ProgramDimensionsPanel/ProgramDimensionsFilter.js
+++ b/src/components/MainSidebar/ProgramDimensionsPanel/ProgramDimensionsFilter.js
@@ -90,15 +90,17 @@ const ProgramDimensionsFilter = ({
                     }
                 />
             )}
-            <SingleSelectOption
-                label={i18n.t('Program indicator')}
-                value={DIMENSION_TYPE_PROGRAM_INDICATOR}
-                icon={
-                    <DimensionIcon
-                        dimensionType={DIMENSION_TYPE_PROGRAM_INDICATOR}
-                    />
-                }
-            />
+            {useSelector(sGetUiInputType) !== OUTPUT_TYPE_TRACKED_ENTITY && (
+                <SingleSelectOption
+                    label={i18n.t('Program indicator')}
+                    value={DIMENSION_TYPE_PROGRAM_INDICATOR}
+                    icon={
+                        <DimensionIcon
+                            dimensionType={DIMENSION_TYPE_PROGRAM_INDICATOR}
+                        />
+                    }
+                />
+            )}
             <SingleSelectOption
                 label={i18n.t('Category')}
                 value={DIMENSION_TYPE_CATEGORY}
diff --git a/src/components/MainSidebar/ProgramDimensionsPanel/useProgramDataDimensions.js b/src/components/MainSidebar/ProgramDimensionsPanel/useProgramDataDimensions.js
index d84a28c49..bb69dce7a 100644
--- a/src/components/MainSidebar/ProgramDimensionsPanel/useProgramDataDimensions.js
+++ b/src/components/MainSidebar/ProgramDimensionsPanel/useProgramDataDimensions.js
@@ -133,6 +133,7 @@ const createDimensionsQuery = ({
 
     if (inputType === OUTPUT_TYPE_TRACKED_ENTITY) {
         params.filter.push('dimensionType:ne:PROGRAM_ATTRIBUTE')
+        params.filter.push('dimensionType:ne:PROGRAM_INDICATOR')
     }
 
     /*