diff --git a/src/game/server/teams.cpp b/src/game/server/teams.cpp
index 581ee063e..4fc7528ad 100644
--- a/src/game/server/teams.cpp
+++ b/src/game/server/teams.cpp
@@ -407,6 +407,9 @@ void CGameTeams::OnTeamFinish(CPlayer** Players, unsigned int Size)
 	for(unsigned int i = 0; i < Size; i++)
 	{
 		PlayerCIDs[i] = Players[i]->GetCID();
+
+		if(g_Config.m_SvTeam != 3 && (m_Core.Team(Players[i]->GetCID()) >= TEAM_SUPER || !m_TeamLocked[m_Core.Team(Players[i]->GetCID())]))
+			SetForceCharacterTeam(Players[i]->GetCID(), 0);
 	}
 
 	if (CallSaveScore && Size >= 2)