diff --git a/packages/dev-server/src/App.tsx b/packages/dev-server/src/App.tsx
index 488e0a9..ede8356 100644
--- a/packages/dev-server/src/App.tsx
+++ b/packages/dev-server/src/App.tsx
@@ -53,9 +53,6 @@ const BoardForPlayer = ({
   const storeRef = useRef<Store | null>(null);
 
   useEffect(() => {
-    if (!match) {
-      return;
-    }
     const { players } = match;
     const { store: mainStore } = match;
     const { board, playerboards } = mainStore.getState();
@@ -139,7 +136,7 @@ const BoardForPlayer = ({
     setLoading(false);
   }, [userId, match]);
 
-  if (loading || !match) {
+  if (loading) {
     return <div>Loading player...</div>;
   }
 
@@ -174,6 +171,12 @@ function RulesWrapper({
   );
 }
 
+function getUserIds(numPlayers: number) {
+  return Array(numPlayers)
+    .fill(null)
+    .map((_, i) => i.toString());
+}
+
 /*
  * Deep copy an object.
  */
@@ -596,12 +599,6 @@ const initMatch = ({
   return match;
 };
 
-function getUserIds(numPlayers: number) {
-  return Array(numPlayers)
-    .fill(null)
-    .map((_, i) => i.toString());
-}
-
 async function render({
   game,
   board,
@@ -646,9 +643,10 @@ async function render({
 
   // Is it the player's board?
   if (userId !== null) {
+    const match = ((window.top as any).lefun as Lefun).match;
     const content = (
       <BoardForPlayer
-        match={((window.top as any).lefun as Lefun)?.match}
+        match={match}
         board={await board()}
         userId={userId}
         messages={messages[locale]}