diff --git a/frontend/src/JoinTeam.tsx b/frontend/src/JoinTeam.tsx
index c504019..31b3bfb 100644
--- a/frontend/src/JoinTeam.tsx
+++ b/frontend/src/JoinTeam.tsx
@@ -40,7 +40,7 @@ export const Join = () => {
     );
     if (r.detail) setError(r.detail);
     else {
-      setTeams({ ...teams, activeTeam: teamID });
+      teamID && teams && setTeams({ ...teams, activeTeam: teamID });
       navigate("/", { replace: true });
     }
   }