diff --git a/src/components/map-container.js b/src/components/map-container.js
index 7af4c4f472..533d3159e5 100644
--- a/src/components/map-container.js
+++ b/src/components/map-container.js
@@ -503,7 +503,7 @@ export default function MapContainerFactory(MapPopover, MapControl, Editor) {
         transformRequest
       };
 
-      const isEdit = mapControls.mapDraw.active;
+      const isEdit = mapControls.mapDraw ? mapControls.mapDraw.active : false;
       const hasGeocoderLayer = layers.find(l => l.id === GEOCODER_LAYER_ID);
 
       return (