diff --git a/src/components/map/MapEditor.js b/src/components/map/MapEditor.js
index e9d66da..1040468 100644
--- a/src/components/map/MapEditor.js
+++ b/src/components/map/MapEditor.js
@@ -99,6 +99,8 @@ function MapEditor({ map, onSettingsChange }) {
     map.grid.inset.bottomRight.x !== defaultInset.bottomRight.x ||
     map.grid.inset.bottomRight.y !== defaultInset.bottomRight.y;
 
+  const gridValid = map.grid.size.x !== 0 && map.grid.size.y !== 0;
+
   const layout = useResponsiveLayout();
 
   return (
@@ -131,7 +133,7 @@ function MapEditor({ map, onSettingsChange }) {
             >
               <Layer ref={mapLayerRef}>
                 <Image image={mapImage} width={mapWidth} height={mapHeight} />
-                {showGridControls && (
+                {showGridControls && gridValid && (
                   <>
                     <MapGrid map={map} />
                     <MapGridEditor map={map} onGridChange={handleGridChange} />
@@ -140,7 +142,7 @@ function MapEditor({ map, onSettingsChange }) {
               </Layer>
             </KonvaBridge>
           </ReactResizeDetector>
-          {gridChanged && (
+          {gridChanged && gridValid && (
             <IconButton
               title="Reset Grid"
               aria-label="Reset Grid"