diff --git a/src/p_tick.c b/src/p_tick.c
index d38d48433..70c4a14f3 100644
--- a/src/p_tick.c
+++ b/src/p_tick.c
@@ -647,18 +647,18 @@ void P_Ticker(boolean run)
 			if (playeringame[i] && players[i].mo && !P_MobjWasRemoved(players[i].mo))
 				P_PlayerAfterThink(&players[i]);
 
-		// Bosses have a punchy start, so no position.
 		if (K_CheckBossIntro() == true)
 		{
+			// Bosses have a punchy start, so no position.
 			if (leveltime == 3)
 			{
 				S_ChangeMusic(mapmusname, mapmusflags, true);
 				S_ShowMusicCredit();
 			}
 		}
-		// Plays the music after the starting countdown.
-		else
+		else if (leveltime < starttime + TICRATE)
 		{
+			// Start countdown/music handling
 			if (leveltime == starttime-(3*TICRATE))
 			{
 				S_StartSound(NULL, sfx_s3ka7); // 3,
@@ -674,10 +674,12 @@ void P_Ticker(boolean run)
 			}
 			else if (leveltime == (starttime + (TICRATE/2)))
 			{
+				// Plays the music after the starting countdown.
 				S_ChangeMusic(mapmusname, mapmusflags, true);
 				S_ShowMusicCredit();
 			}
 
+			// POSITION!! music
 			if (encoremode)
 			{
 				// Encore humming starts immediately.