diff --git a/packages/client/src/components/app/embedded-map/EmbeddedMap.svelte b/packages/client/src/components/app/embedded-map/EmbeddedMap.svelte
index a6803ef5dd..7738a0d345 100644
--- a/packages/client/src/components/app/embedded-map/EmbeddedMap.svelte
+++ b/packages/client/src/components/app/embedded-map/EmbeddedMap.svelte
@@ -231,11 +231,15 @@
     titleKey,
     onClick
   ) => {
-    if (!mapInstance || !validRows?.length) {
+    if (!mapInstance) {
       return
     }
 
     mapMarkerGroup.clearLayers()
+    if (!validRows?.length) {
+      return
+    }
+
     validRows.forEach(row => {
       let markerCoords = [row[latKey], row[lngKey]]
       let marker = L.marker(markerCoords, mapMarkerOptions).addTo(mapInstance)