diff --git a/CTFd/auth.py b/CTFd/auth.py
index ce01324f..3bbb5fa9 100644
--- a/CTFd/auth.py
+++ b/CTFd/auth.py
@@ -512,7 +512,7 @@ def oauth_redirect():
                     )
                     return redirect(url_for("auth.login"))
 
-            if get_config("user_mode") == TEAMS_MODE:
+            if get_config("user_mode") == TEAMS_MODE and user.team_id is None:
                 team_id = api_data["team"]["id"]
                 team_name = api_data["team"]["name"]