diff --git a/packages/grafana-data/src/panel/getPanelOptionsWithDefaults.test.ts b/packages/grafana-data/src/panel/getPanelOptionsWithDefaults.test.ts
index 0d26895cd0e..01b42612f1d 100644
--- a/packages/grafana-data/src/panel/getPanelOptionsWithDefaults.test.ts
+++ b/packages/grafana-data/src/panel/getPanelOptionsWithDefaults.test.ts
@@ -317,7 +317,7 @@ describe('getPanelOptionsWithDefaults', () => {
       `);
     });
 
-    it('should remove custom overrides that no longer exist', () => {
+    it('should remove custom override properties that no longer exist', () => {
       const result = runScenario({
         defaults: {},
         overrides: [
@@ -342,8 +342,8 @@ describe('getPanelOptionsWithDefaults', () => {
         ],
       });
 
-      expect(result.fieldConfig.overrides.length).toBe(1);
-      expect(result.fieldConfig.overrides[0].properties[0].id).toBe('custom.customProp');
+      expect(result.fieldConfig.overrides.length).toBe(2);
+      expect(result.fieldConfig.overrides[0].properties.length).toBe(0);
     });
   });
 });
diff --git a/packages/grafana-data/src/panel/getPanelOptionsWithDefaults.ts b/packages/grafana-data/src/panel/getPanelOptionsWithDefaults.ts
index 3bcdf8883ae..3f3516c3e30 100644
--- a/packages/grafana-data/src/panel/getPanelOptionsWithDefaults.ts
+++ b/packages/grafana-data/src/panel/getPanelOptionsWithDefaults.ts
@@ -99,16 +99,14 @@ export function filterFieldConfigOverrides(
   overrides: ConfigOverrideRule[],
   condition: (value: DynamicConfigValue) => boolean
 ): ConfigOverrideRule[] {
-  return overrides
-    .map((x) => {
-      const properties = x.properties.filter(condition);
+  return overrides.map((x) => {
+    const properties = x.properties.filter(condition);
 
-      return {
-        ...x,
-        properties,
-      };
-    })
-    .filter((x) => x.properties.length > 0);
+    return {
+      ...x,
+      properties,
+    };
+  });
 }
 
 function cleanProperties(obj: object, parentPath: string, fieldConfigRegistry: FieldConfigOptionsRegistry) {