diff --git a/src/g_game.c b/src/g_game.c
index 956751bb9..30519b379 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2999,6 +2999,8 @@ boolean G_EnoughPlayersFinished(void)
 	{
 		if (!playeringame[i] || players[i].spectator || players[i].bot)
 			continue;
+		if (players[i].quittime > 30 * TICRATE)
+			continue;
 		if (players[i].lives <= 0)
 			continue;
 
diff --git a/src/p_user.c b/src/p_user.c
index ea42a2c36..4044428b8 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -11479,6 +11479,8 @@ void P_PlayerThink(player_t *player)
 			{
 				if (!playeringame[i] || players[i].spectator || players[i].bot)
 					continue;
+				if (players[i].quittime > 30 * TICRATE)
+					continue;
 				if (players[i].lives <= 0)
 					continue;