diff --git a/src/components/map/MapInteraction.js b/src/components/map/MapInteraction.js
index 5b075ab..e70e447 100644
--- a/src/components/map/MapInteraction.js
+++ b/src/components/map/MapInteraction.js
@@ -32,8 +32,7 @@ function MapInteraction({
   useEffect(() => {
     if (map === null) {
       setMapLoaded(false);
-    }
-    if (mapImageSourceStatus === "loaded") {
+    } else if (mapImageSourceStatus === "loaded") {
       setMapLoaded(true);
     }
   }, [mapImageSourceStatus, map]);
diff --git a/src/helpers/useMapImage.js b/src/helpers/useMapImage.js
index 8073e3a..b6f408e 100644
--- a/src/helpers/useMapImage.js
+++ b/src/helpers/useMapImage.js
@@ -3,6 +3,8 @@ import useImage from "use-image";
 
 import useDataSource from "./useDataSource";
 
+import { isEmpty } from "./shared";
+
 import { mapSources as defaultMapSources } from "../maps";
 
 function useMapImage(map) {
@@ -38,6 +40,8 @@ function useMapImage(map) {
       if (map.file && map.quality !== mapSourceMap.quality) {
         updateMapSource();
       }
+    } else if (!map && !isEmpty(mapSourceMap)) {
+      setMapSourceMap({});
     }
   }, [map, mapSourceMap]);