diff --git a/src/components/map/Map.js b/src/components/map/Map.js
index f3683b3..e1c8f73 100644
--- a/src/components/map/Map.js
+++ b/src/components/map/Map.js
@@ -237,7 +237,7 @@ function Map({
     }
   }
 
-  const mapTokens = mapState && (
+  const mapTokens = map && mapState && (
     <Group>
       {Object.values(mapState.tokens)
         .sort((a, b) => sortMapTokenStates(a, b, draggingTokenOptions))