1 files changed, 5 insertions, 1 deletions
diff --git a/src/game/g_team.c b/src/game/g_team.c
index f3ca0f84..ad29beaf 100644
--- a/src/game/g_team.c
+++ b/src/game/g_team.c
@@ -222,7 +222,11 @@ void G_ChangeTeam( gentity_t *ent, team_t newTeam )
 
   if( !g_cheats.integer )
   {
-    ent->client->noclip = qfalse;
+    if( ent->client->noclip )
+    {
+      ent->client->noclip = qfalse;
+      ent->r.contents = ent->client->cliprcontents;
+    }
     ent->flags &= ~( FL_GODMODE | FL_NOTARGET );
   }