diff --git a/src/components/map/Map.js b/src/components/map/Map.js
index 682e254..607761a 100644
--- a/src/components/map/Map.js
+++ b/src/components/map/Map.js
@@ -10,6 +10,7 @@ import MapFog from "./MapFog";
 import TokenDataContext from "../../contexts/TokenDataContext";
 import TokenMenu from "../token/TokenMenu";
 import TokenDragOverlay from "../token/TokenDragOverlay";
+import LoadingOverlay from "../LoadingOverlay";
 
 import { omit } from "../../helpers/shared";
 
@@ -35,7 +36,10 @@ function Map({
 
   const gridX = map && map.gridX;
   const gridY = map && map.gridY;
-  const gridSizeNormalized = { x: 1 / gridX || 0, y: 1 / gridY || 0 };
+  const gridSizeNormalized = {
+    x: gridX ? 1 / gridX : 0,
+    y: gridY ? 1 / gridY : 0,
+  };
   const tokenSizePercent = gridSizeNormalized.x;
 
   const [selectedToolId, setSelectedToolId] = useState("pan");
@@ -271,6 +275,7 @@ function Map({
           {mapControls}
           {tokenMenu}
           {tokenDragOverlay}
+          {loading && <LoadingOverlay />}
         </>
       }
       selectedToolId={selectedToolId}
diff --git a/src/components/map/MapToken.js b/src/components/map/MapToken.js
index 802dffe..57dcb58 100644
--- a/src/components/map/MapToken.js
+++ b/src/components/map/MapToken.js
@@ -92,12 +92,7 @@ function MapToken({
   const imageRef = useRef();
   useEffect(() => {
     const image = imageRef.current;
-    if (
-      image &&
-      tokenSourceStatus === "loaded" &&
-      tokenWidth > 0 &&
-      tokenHeight > 0
-    ) {
+    if (image && tokenSourceStatus === "loaded") {
       image.cache({
         pixelRatio: debouncedStageScale * window.devicePixelRatio,
       });
@@ -107,7 +102,7 @@ function MapToken({
     }
   }, [debouncedStageScale, tokenWidth, tokenHeight, tokenSourceStatus]);
 
-  if (!tokenWidth || !tokenHeight) {
+  if (!tokenWidth || !tokenHeight || tokenSourceStatus === "loading") {
     return null;
   }