diff --git a/public/app/plugins/panel/geomap/editor/FrameSelectionEditor.tsx b/public/app/plugins/panel/geomap/editor/FrameSelectionEditor.tsx
index 26bf727d8b9..8f19c7f2f03 100644
--- a/public/app/plugins/panel/geomap/editor/FrameSelectionEditor.tsx
+++ b/public/app/plugins/panel/geomap/editor/FrameSelectionEditor.tsx
@@ -21,6 +21,6 @@ export const FrameSelectionEditor = ({ value, context, onChange }: Props) => {
   );
 
   return (
-    <RefIDPicker value={value.options} onChange={onFilterChange} data={context.data} placeholder="Change filter" />
+    <RefIDPicker value={value?.options} onChange={onFilterChange} data={context.data} placeholder="Change filter" />
   );
 };