diff --git a/regamedll/regamedll/regamedll_interfaces_impl.cpp b/regamedll/regamedll/regamedll_interfaces_impl.cpp
index f0d92455..85f4325c 100644
--- a/regamedll/regamedll/regamedll_interfaces_impl.cpp
+++ b/regamedll/regamedll/regamedll_interfaces_impl.cpp
@@ -73,7 +73,7 @@ bool EXT_FUNC CCSPlayer::JoinTeam(TeamName team)
 	case CT:
 	case TERRORIST:
 	{
-		if (pPlayer->m_iTeam == SPECTATOR)
+		if (pPlayer->m_iTeam == SPECTATOR || pPlayer->m_iTeam == UNASSIGNED)
 		{
 			// If they're switching into spectator, setup spectator properties..
 			pPlayer->m_bNotKilled = true;