diff --git a/src/g_game.c b/src/g_game.c
index 45f7ae9ba..c6d1f9539 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2003,7 +2003,7 @@ void G_Ticker(boolean run)
 			memset(player_name_changes, 0, sizeof player_name_changes);
 		}
 
-		if (Playing() == true)
+		if (Playing() == true || demo.playback)
 		{
 			if (musiccountdown > 1)
 			{
@@ -2017,7 +2017,10 @@ void G_Ticker(boolean run)
 					P_EndingMusic();
 				}
 			}
+		}
 
+		if (Playing() == true)
+		{
 			P_InvincGrowMusic();
 
 			K_TickMidVote();
diff --git a/src/p_user.c b/src/p_user.c
index 63bfe58ba..b86271c69 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -1273,7 +1273,7 @@ void P_DoPlayerExit(player_t *player, pflags_t flags)
 
 	K_UpdatePowerLevelsFinalize(player, false);
 
-	if (P_IsPartyPlayer(player) && !specialout && musiccountdown == 0)
+	if (G_IsPartyLocal(player - players) && !specialout && musiccountdown == 0)
 	{
 		Music_Play("finish_silence");
 		musiccountdown = MUSIC_COUNTDOWN_MAX;
@@ -3833,7 +3833,7 @@ void P_DoTimeOver(player_t *player)
 		P_DamageMobj(player->mo, NULL, NULL, 1, DMG_TIMEOVER);
 	}
 
-	if (P_IsPartyPlayer(player) && musiccountdown == 0)
+	if (G_IsPartyLocal(player - players) && musiccountdown == 0)
 	{
 		Music_Play("finish_silence");
 		musiccountdown = MUSIC_COUNTDOWN_MAX;