diff --git a/src/p_user.c b/src/p_user.c
index a903bf7f1..30227bc46 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -1379,7 +1379,7 @@ void P_DoPlayerExit(player_t *player, pflags_t flags)
 			}
 		}
 
-		if (player == &players[consoleplayer])
+		if (!demo.savebutton && P_IsLocalPlayer(player))
 			demo.savebutton = leveltime;
 	}
 }