diff --git a/src/network/NetworkedMapAndTokens.js b/src/network/NetworkedMapAndTokens.js
index a525f5a..3ed1356 100644
--- a/src/network/NetworkedMapAndTokens.js
+++ b/src/network/NetworkedMapAndTokens.js
@@ -174,6 +174,10 @@ function NetworkedMapAndTokens({ session }) {
   }, [currentMap, debouncedMapState, userId, database]);
 
   function handleMapChange(newMap, newMapState) {
+    // Clear map before sending new one
+    setCurrentMap(null);
+    session.socket?.emit("map", null);
+
     setCurrentMapState(newMapState, true, true);
     setCurrentMap(newMap);