diff --git a/src/components/layers/SourcesLayer.tsx b/src/components/layers/SourcesLayer.tsx
index fad6071..ae356d8 100644
--- a/src/components/layers/SourcesLayer.tsx
+++ b/src/components/layers/SourcesLayer.tsx
@@ -144,7 +144,7 @@ export function SourcesLayer({
       map.removeOverlay(popupOverlay);
       map.removeInteraction(select);
     };
-  }, []);
+  }, [mapRef.current]);
 
   useEffect(() => {
     if (mapRef.current) {
@@ -157,7 +157,7 @@ export function SourcesLayer({
       handleSourceClickRef.current = handleSourceClick;
       selectInteractionRef.current?.on('select', handleSourceClick);
     }
-  }, [handleSourceClick]);
+  }, [handleSourceClick, selectInteractionRef.current]);
 
   useEffect(() => {
     const map = mapRef.current;