diff --git a/src/p_user.c b/src/p_user.c
index d3407bd6..a59986e7 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -8349,6 +8349,8 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
 		angle = thiscam->angle;
 	else if (leveltime < starttime)
 		angle = focusangle + FixedAngle(camrotate*FRACUNIT);
+	else if (demoplayback)
+		angle = players[consoleplayer].cmd.angleturn<<16;
 	else
 	{
 		angle_t input = focusangle + FixedAngle(camrotate<<FRACBITS) - thiscam->angle;
@@ -8361,9 +8363,6 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
 			input = InvAngle(input);
 
 		angle = thiscam->angle + input;
-
-		if (demoplayback && player == &players[consoleplayer])
-			localangle = angle;
 	}
 
 	if (!resetcalled && (leveltime > starttime)
diff --git a/src/r_main.c b/src/r_main.c
index 5990224c..4cf2d879 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -857,7 +857,7 @@ void R_SkyboxFrame(player_t *player)
 	{
 		aimingangle = player->aiming;
 		viewangle = player->mo->angle;
-		if (!demoplayback && player->playerstate != PST_DEAD)
+		if (/*!demoplayback && */player->playerstate != PST_DEAD)
 		{
 			if (player == &players[consoleplayer])
 			{
@@ -1136,7 +1136,7 @@ void R_SetupFrame(player_t *player, boolean skybox)
 		aimingangle = player->aiming;
 		viewangle = viewmobj->angle;
 
-		if (!demoplayback && player->playerstate != PST_DEAD)
+		if (/*!demoplayback && */player->playerstate != PST_DEAD)
 		{
 			if (player == &players[consoleplayer])
 			{