diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp
index e73d2897e..bd2c0fd7e 100644
--- a/src/game/server/gamecontext.cpp
+++ b/src/game/server/gamecontext.cpp
@@ -472,11 +472,8 @@ void CGameContext::StartVote(const char *pDesc, const char *pCommand, const char
 
 void CGameContext::EndVote()
 {
-	if(m_apPlayers[m_VoteVictim])
-		m_apPlayers[m_VoteVictim]->Pause(CPlayer::PAUSE_NONE, false);
 	m_VoteCloseTime = 0;
 	SendVoteSet(-1);
-	m_VoteVictim = -1;
 }
 
 void CGameContext::SendVoteSet(int ClientID)
@@ -2236,6 +2233,7 @@ void CGameContext::ConSetTeam(IConsole::IResult *pResult, void *pUserData)
 	str_format(aBuf, sizeof(aBuf), "moved client %d to team %d", ClientID, Team);
 	pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
 
+	pSelf->m_apPlayers[ClientID]->Pause(CPlayer::PAUSE_NONE, false); // reset /spec and /pause to allow rejoin
 	pSelf->m_apPlayers[ClientID]->m_TeamChangeTick = pSelf->Server()->Tick()+pSelf->Server()->TickSpeed()*Delay*60;
 	pSelf->m_apPlayers[ClientID]->SetTeam(Team);
 	if(Team == TEAM_SPECTATORS)