diff --git a/src/p_user.c b/src/p_user.c
index 7646ca6d4..f34b1a2e9 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -8188,7 +8188,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
 		|| (leveltime < introtime)); // Kart intro cam
 #endif
 
-	if (!(player->climbing || (player->pflags & PF_NIGHTSMODE) || player->playerstate == PST_DEAD))
+	if (!(player->playerstate == PST_DEAD || player->exiting))
 	{
 		if (player->spectator) // force cam off for spectators
 			return true;
diff --git a/src/r_main.c b/src/r_main.c
index 5da98c8ec..d83ce8d06 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -1094,10 +1094,10 @@ void R_SetupFrame(player_t *player, boolean skybox)
 		chasecam = (cv_chasecam.value != 0);
 	}
 
-	if (player->playerstate == PST_DEAD || player->exiting)
-		chasecam = true; // force chasecam on
-	else if (player->spectator) // no spectator chasecam
+	if (player->spectator) // no spectator chasecam
 		chasecam = false; // force chasecam off
+	else if (player->playerstate == PST_DEAD || player->exiting)
+		chasecam = true; // force chasecam on
 
 	if (chasecam && !thiscam->chase)
 	{