diff --git a/public/app/plugins/panel/geomap/editor/layerEditor.tsx b/public/app/plugins/panel/geomap/editor/layerEditor.tsx
index 4f70a82e587..d85a00afd4e 100644
--- a/public/app/plugins/panel/geomap/editor/layerEditor.tsx
+++ b/public/app/plugins/panel/geomap/editor/layerEditor.tsx
@@ -101,7 +101,9 @@ export function getLayerEditor(opts: LayerEditorOptions): NestedPanelOptions<Map
         // If `filterData` exists filter data feeding into location editor
         if (options.filterData) {
           const matcherFunc = getFrameMatchers(options.filterData);
-          data = data.filter(matcherFunc);
+          if (data.some(matcherFunc)) {
+            data = data.filter(matcherFunc);
+          }
         }
 
         addLocationFields('Location', 'location.', builder, options.location, data);
diff --git a/public/app/plugins/panel/geomap/utils/layers.ts b/public/app/plugins/panel/geomap/utils/layers.ts
index a6e9ecbbff0..f20d8891ade 100644
--- a/public/app/plugins/panel/geomap/utils/layers.ts
+++ b/public/app/plugins/panel/geomap/utils/layers.ts
@@ -26,10 +26,12 @@ export const applyLayerFilter = (
     let panelData = panelDataProps;
     if (options.filterData) {
       const matcherFunc = getFrameMatchers(options.filterData);
-      panelData = {
-        ...panelData,
-        series: panelData.series.filter(matcherFunc),
-      };
+      if (panelData.series.some(matcherFunc)) {
+        panelData = {
+          ...panelData,
+          series: panelData.series.filter(matcherFunc),
+        };
+      }
     }
     handler.update(panelData);
   }