diff --git a/src/components/pageElements/Map.jsx b/src/components/pageElements/Map.jsx
index 3ba18e9..6e192e9 100644
--- a/src/components/pageElements/Map.jsx
+++ b/src/components/pageElements/Map.jsx
@@ -68,10 +68,10 @@ export default function PlssMap({ color, dispatch, drawerOpen, state }) {
   const analytics = useAnalytics();
 
   const isLoading = useViewLoading(mapView.current);
-  const { graphic, setGraphic } = useGraphicManager(mapView);
-  const { setGraphic: setUserGraphics } = useGraphicManager(mapView);
-  const { setGraphic: setGpsGraphic } = useGraphicManager(mapView);
-  const { setViewPoint } = useViewPointZooming(mapView);
+  const { graphic, setGraphic } = useGraphicManager(mapView.current);
+  const { setGraphic: setUserGraphics } = useGraphicManager(mapView.current);
+  const { setGraphic: setGpsGraphic } = useGraphicManager(mapView.current);
+  const { setViewPoint } = useViewPointZooming(mapView.current);
 
   const functions = useFunctions();
   const myContent = httpsCallable(functions, 'getMyContent');