diff --git a/src/p_inter.c b/src/p_inter.c
index 71dcd70a1..8090b7406 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -2257,9 +2257,9 @@ void P_CheckSurvivors(void)
 		{
 			if (players[i].spectator)
 				spectators++;
-			else if (players[i].pflags & PF_TAGIT)
+			else if ((players[i].pflags & PF_TAGIT) && players[i].quittime < 30 * TICRATE)
 				taggers++;
-			else if (!(players[i].pflags & PF_GAMETYPEOVER))
+			else if (!(players[i].pflags & PF_GAMETYPEOVER) && players[i].quittime < 30 * TICRATE)
 			{
 				survivorarray[survivors] = i;
 				survivors++;
diff --git a/src/p_setup.c b/src/p_setup.c
index 679060d44..729ee00c2 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -3097,7 +3097,7 @@ static void P_InitTagGametype(void)
 	//Also, you'd never have to loop through all 32 players slots to find anything ever again.
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
-		if (playeringame[i] && !players[i].spectator)
+		if (playeringame[i] && !(players[i].spectator && players[i].quittime))
 		{
 			playersactive[realnumplayers] = i; //stores the player's node in the array.
 			realnumplayers++;
diff --git a/src/p_tick.c b/src/p_tick.c
index 4dd3bb30a..a4b8aa097 100644
--- a/src/p_tick.c
+++ b/src/p_tick.c
@@ -599,6 +599,10 @@ void P_Ticker(boolean run)
 			if (players[i].quittime)
 			{
 				players[i].quittime++;
+
+				if (players[i].quittime == 30 * TICRATE)
+					P_CheckSurvivors();
+
 				if (server && players[i].quittime >= FixedMul(cv_rejointimeout.value, 60 * TICRATE))
 					SendKick(i, KICK_MSG_PLAYER_QUIT);
 			}