diff --git a/src/g_game.c b/src/g_game.c
index ee1ee053a..4cf7be6cd 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -4496,6 +4496,13 @@ void G_ReadDemoTiccmd(ticcmd_t *cmd, INT32 playernum)
 
 	G_CopyTiccmd(cmd, &oldcmd, 1);
 
+	// SRB2kart: Copy-pasted from ticcmd building, removes that crappy demo cam
+	if (((players[displayplayer].mo && players[displayplayer].speed > 0) // Moving
+		|| (leveltime > starttime && (cmd->buttons & BT_ACCELERATE && cmd->buttons & BT_BRAKE)) // Rubber-burn turn
+		|| (players[displayplayer].spectator || objectplacing)) // Not a physical player
+		&& !(players[displayplayer].kartstuff[k_spinouttimer] && players[displayplayer].kartstuff[k_sneakertimer])) // Spinning and boosting cancels out spinout
+		localangle += (cmd->angleturn<<16);
+
 	if (!(demoflags & DF_GHOST) && *demo_p == DEMOMARKER)
 	{
 		// end of demo data stream
diff --git a/src/g_game.h b/src/g_game.h
index e34a69860..4dab9a764 100644
--- a/src/g_game.h
+++ b/src/g_game.h
@@ -188,7 +188,6 @@ void G_StopMetalDemo(void);
 ATTRNORETURN void FUNCNORETURN G_StopMetalRecording(void);
 void G_StopDemo(void);
 boolean G_CheckDemoStatus(void);
-char *G_DemoPlayerName(char *defdemoname);
 
 boolean G_IsSpecialStage(INT32 mapnum);
 boolean G_GametypeUsesLives(void);
diff --git a/src/p_user.c b/src/p_user.c
index a09d35e14..86f89d45a 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -8215,7 +8215,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
 //	if (leveltime > 0 && timeinmap <= 0)
 //		return true;
 
-	if (player->pflags & PF_NIGHTSMODE)
+	if (demoplayback)
 	{
 		focusangle = mo->angle;
 		focusaiming = 0;
@@ -8310,8 +8310,6 @@ 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;