diff --git a/src/p_user.c b/src/p_user.c
index e0fdb270c..d542ceaea 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -2950,7 +2950,8 @@ static void P_DeathThink(player_t *player)
 		}
 		else
 		{
-			player->playerstate = PST_REBORN;
+			if (!player->exiting)
+				player->playerstate = PST_REBORN;
 		}
 	}