diff --git a/src/components/views/location/Map.tsx b/src/components/views/location/Map.tsx
index c1dbcab337..22a4bda63e 100644
--- a/src/components/views/location/Map.tsx
+++ b/src/components/views/location/Map.tsx
@@ -106,10 +106,6 @@ const useMapWithStyle = ({
             });
             setGeolocate(geolocate);
             map.addControl(geolocate);
-            geolocate.on("error", onGeolocateError);
-            return () => {
-                geolocate.off("error", onGeolocateError);
-            };
         }
         if (!allowGeolocate && geolocate) {
             map.removeControl(geolocate);
@@ -117,6 +113,15 @@ const useMapWithStyle = ({
         }
     }, [map, geolocate, allowGeolocate]);
 
+    useEffect(() => {
+        if (geolocate) {
+            geolocate.on("error", onGeolocateError);
+            return () => {
+                geolocate.off("error", onGeolocateError);
+            };
+        }
+    }, [geolocate]);
+
     return {
         map,
         bodyId,
diff --git a/test/components/structures/__snapshots__/PictureInPictureDragger-test.tsx.snap b/test/components/structures/__snapshots__/PictureInPictureDragger-test.tsx.snap
index 0e382ea7f0..4f95f5e41f 100644
--- a/test/components/structures/__snapshots__/PictureInPictureDragger-test.tsx.snap
+++ b/test/components/structures/__snapshots__/PictureInPictureDragger-test.tsx.snap
@@ -30,27 +30,3 @@ exports[`PictureInPictureDragger when rendering the dragger with PiP content 1 a
   </aside>
 </div>
 `;
-
-exports[`PictureInPictureDragger when rendering the dragger with PiP content 1 and rerendering PiP content 1 should not change the PiP content: pip-content-1 1`] = `
-<div>
-  <aside
-    style="transform: translateX(680px) translateY(478px);"
-  >
-    <div>
-      content 1
-    </div>
-  </aside>
-</div>
-`;
-
-exports[`PictureInPictureDragger when rendering the dragger with PiP content 1 should render the PiP content: pip-content-1 1`] = `
-<div>
-  <aside
-    style="transform: translateX(680px) translateY(478px);"
-  >
-    <div>
-      content 1
-    </div>
-  </aside>
-</div>
-`;