diff --git a/packages/client/src/components/app/embedded-map/EmbeddedMap.svelte b/packages/client/src/components/app/embedded-map/EmbeddedMap.svelte
index 200aaaaed9..342927252a 100644
--- a/packages/client/src/components/app/embedded-map/EmbeddedMap.svelte
+++ b/packages/client/src/components/app/embedded-map/EmbeddedMap.svelte
@@ -216,13 +216,10 @@
         row[titleKey]
       )
 
-      marker.bindPopup(markerContent).addTo(mapMarkerGroup)
-
-      //https://github.com/Leaflet/Leaflet/issues/7331
-      marker.on("click", function () {
-        this.openPopup()
-      })
-
+      marker.bindTooltip(markerContent, {
+        direction: "top",
+        offset: [0, -25]
+      }).addTo(mapMarkerGroup)
       mapMarkers = [...mapMarkers, marker]
     })
   }