diff --git a/src/network/NetworkedMapAndTokens.js b/src/network/NetworkedMapAndTokens.js
index d5e5075..ee03596 100644
--- a/src/network/NetworkedMapAndTokens.js
+++ b/src/network/NetworkedMapAndTokens.js
@@ -370,8 +370,9 @@ function NetworkedMapAndTokens({ session }) {
 
       if (id === "mapResponse") {
         const newMap = data;
-        await putMap(newMap);
         setCurrentMap(newMap);
+        await putMap(newMap);
+        assetLoadFinish();
       }
 
       if (id === "tokenRequest") {
@@ -382,6 +383,7 @@ function NetworkedMapAndTokens({ session }) {
       if (id === "tokenResponse") {
         const newToken = data;
         await putToken(newToken);
+        assetLoadFinish();
       }
     }
 
@@ -389,9 +391,6 @@ function NetworkedMapAndTokens({ session }) {
       if (count === 1) {
         assetLoadStart();
       }
-      if (total === count) {
-        assetLoadFinish();
-      }
       assetProgressUpdate({ id, total, count });
     }