diff --git a/web/src/lib/components/shared-components/map/map.svelte b/web/src/lib/components/shared-components/map/map.svelte
index ecfe75258c..9a24c7e342 100644
--- a/web/src/lib/components/shared-components/map/map.svelte
+++ b/web/src/lib/components/shared-components/map/map.svelte
@@ -33,10 +33,6 @@
   let map: maplibregl.Map;
   let marker: maplibregl.Marker | null = null;
 
-  $: if (map) {
-    map.on('click', handleMapClick);
-  }
-
   $: style = (async () => {
     const { data } = await api.systemConfigApi.getMapStyle({
       theme: $mapSettings.allowDarkMode ? $colorTheme : 'light',
@@ -120,6 +116,7 @@
     diffStyleUpdates={true}
     let:map
     on:load={(event) => event.detail.setMaxZoom(14)}
+    on:load={(event) => event.detail.on('click', handleMapClick)}
     bind:map
   >
     <NavigationControl position="top-left" showCompass={!simplified} />