diff --git a/src/p_tick.c b/src/p_tick.c
index 4962fada9..d4c705658 100644
--- a/src/p_tick.c
+++ b/src/p_tick.c
@@ -769,30 +769,33 @@ void P_Ticker(boolean run)
 		// Plays the music after the starting countdown.
 		else
 		{
-			if (!(gametyperules & GTR_FREEROAM)  && !(titlemapinaction == TITLEMAP_RUNNING))
+			if (!(titlemapinaction == TITLEMAP_RUNNING))
 			{
-				if (leveltime == starttime-(3*TICRATE))
+				if (!(gametyperules & GTR_FREEROAM))
 				{
-					S_StartSound(NULL, sfx_s3ka7); // 3,
+					if (leveltime == starttime-(3*TICRATE))
+					{
+						S_StartSound(NULL, sfx_s3ka7); // 3,
+					}
+					else if ((leveltime == starttime-(2*TICRATE)) || (leveltime == starttime-TICRATE))
+					{
+						S_StartSound(NULL, sfx_s3ka7); // 2, 1,
+					}
+					else if (leveltime == starttime)
+					{
+						S_StartSound(NULL, sfx_s3kad); // GO!
+					}
 				}
-				else if ((leveltime == starttime-(2*TICRATE)) || (leveltime == starttime-TICRATE))
-				{
-					S_StartSound(NULL, sfx_s3ka7); // 2, 1,
-				}
-				else if (leveltime == starttime)
-				{
-					S_StartSound(NULL, sfx_s3kad); // GO!
-				}
-			}
 			
-			if (!(gametyperules & GTR_FREEROAM) && leveltime < starttime) // SRB2Kart
-				S_ChangeMusicInternal((encoremode ? "estart" : "kstart"), false); // yes this will be spammed otherwise encore and some stuff WILL overwrite it
-			else if (leveltime == starttime) // The GO! sound stops the level start ambience
-				S_StopMusic();
-			else if (leveltime == starttime + (TICRATE/2)) // Plays the music after the starting countdown.
-			{
-				S_ChangeMusicEx(mapmusname, mapmusflags, true, mapmusposition, 0, 0);
-				S_ShowMusicCredit();
+				if (!(gametyperules & GTR_FREEROAM) && leveltime < starttime) // SRB2Kart
+					S_ChangeMusicInternal((encoremode ? "estart" : "kstart"), false); // yes this will be spammed otherwise encore and some stuff WILL overwrite it
+				else if (leveltime == starttime) // The GO! sound stops the level start ambience
+					S_StopMusic();
+				else if (leveltime == starttime + (TICRATE/2)) // Plays the music after the starting countdown.
+				{
+					S_ChangeMusicEx(mapmusname, mapmusflags, true, mapmusposition, 0, 0);
+					S_ShowMusicCredit();
+				}
 			}
 			
 		}