diff --git a/src/game/server/player.cpp b/src/game/server/player.cpp
index 75c2c1c6a..4b37385f3 100644
--- a/src/game/server/player.cpp
+++ b/src/game/server/player.cpp
@@ -259,6 +259,7 @@ void CPlayer::SetTeam(int Team, bool DoChatMsg)
 
 	m_Team = Team;
 	m_LastActionTick = Server()->Tick();
+	m_SpectatorID = SPEC_FREEVIEW;
 	// we got to wait 0.5 secs before respawning
 	m_RespawnTick = Server()->Tick()+Server()->TickSpeed()/2;
 	str_format(aBuf, sizeof(aBuf), "team_join player='%d:%s' m_Team=%d", m_ClientID, Server()->ClientName(m_ClientID), m_Team);