diff --git a/src/contexts/MapDataContext.js b/src/contexts/MapDataContext.js
index db92328..92488de 100644
--- a/src/contexts/MapDataContext.js
+++ b/src/contexts/MapDataContext.js
@@ -219,7 +219,6 @@ export function MapDataProvider({ children }) {
   }
 
   async function getMapFromDB(mapId) {
-    if (!database) return;
     return await database.table("maps").get(mapId);
   }
 
diff --git a/src/routes/Game.js b/src/routes/Game.js
index 54fa351..1e979c1 100644
--- a/src/routes/Game.js
+++ b/src/routes/Game.js
@@ -10,6 +10,7 @@ import AuthModal from "../modals/AuthModal";
 
 import AuthContext from "../contexts/AuthContext";
 import { MapStageProvider } from "../contexts/MapStageContext";
+import DatabaseContext from "../contexts/DatabaseContext";
 
 import NetworkedMapAndTokens from "../network/NetworkedMapAndTokens";
 import NetworkedParty from "../network/NetworkedParty";
@@ -25,6 +26,7 @@ function Game() {
     password,
     setAuthenticationStatus,
   } = useContext(AuthContext);
+  const { databaseStatus } = useContext(DatabaseContext);
 
   // Handle authentication status
   useEffect(() => {
@@ -82,8 +84,11 @@ function Game() {
 
   // Join game
   useEffect(() => {
-    session.joinParty(gameId, password);
-  }, [gameId, password]);
+    if (databaseStatus !== "loading") {
+      console.log("join");
+      session.joinParty(gameId, password);
+    }
+  }, [gameId, password, databaseStatus]);
 
   // A ref to the Konva stage
   // the ref will be assigned in the MapInteraction component