diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 857b2251d..addb333eb 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -3764,7 +3764,7 @@ static void Got_Teamchange(UINT8 **cp, INT32 playernum)
 
 	//Safety first!
 	// (not respawning spectators here...)
-	if (!players[playernum].spectator)
+	if (!players[playernum].spectator && gamestate == GS_LEVEL)
 	{
 		if (players[playernum].mo)
 		{