diff --git a/src/components/map/Map.js b/src/components/map/Map.js
index 71b0a1f..9be30fb 100644
--- a/src/components/map/Map.js
+++ b/src/components/map/Map.js
@@ -174,7 +174,7 @@ function Map({
     disabledSettings.shape.push("redo");
     disabledSettings.erase.push("redo");
   }
-  if (fogShapes.length === 0) {
+  if (!mapState || mapState.fogDrawActionIndex < 0) {
     disabledSettings.fog.push("undo");
   }
   if (