diff --git a/src/components/map/MapFog.js b/src/components/map/MapFog.js
index eaed990..16a82a9 100644
--- a/src/components/map/MapFog.js
+++ b/src/components/map/MapFog.js
@@ -430,7 +430,7 @@ function MapFog({
 
     // Constrain fog buffer to the map resolution
     const fogRect = fogGroup.getClientRect();
-    const maxMapSize = Math.max(map.width, map.height);
+    const maxMapSize = map ? Math.max(map.width, map.height) : 4096; // Default to 4096
     const maxFogSize =
       Math.max(fogRect.width, fogRect.height) / debouncedStageScale;
     const maxPixelRatio = maxMapSize / maxFogSize;
diff --git a/src/components/map/MapToken.js b/src/components/map/MapToken.js
index 2b3ea7d..f457c7c 100644
--- a/src/components/map/MapToken.js
+++ b/src/components/map/MapToken.js
@@ -192,7 +192,7 @@ function MapToken({
       tokenWidth > 0 &&
       tokenHeight > 0
     ) {
-      const maxImageSize = Math.max(token.width, token.height);
+      const maxImageSize = token ? Math.max(token.width, token.height) : 512; // Default to 512px
       const maxTokenSize = Math.max(tokenWidth, tokenHeight);
       // Constrain image buffer to original image size
       const maxRatio = maxImageSize / maxTokenSize;