diff --git a/src/g_game.c b/src/g_game.c
index e818ab1c..29d6672b 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -348,9 +348,9 @@ static void G_DemoSkipTics(void)
 
     if (playback_skiptics < curtic)
     {
+      playback_skiptics = 0;
       G_EnableWarp(false);
       S_RestartMusic();
-      playback_skiptics = 0;
     }
   }
 }
diff --git a/src/s_sound.c b/src/s_sound.c
index 150efc18..8fa96827 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -536,15 +536,14 @@ void S_ChangeMusInfoMusic (int lumpnum, int looping)
 {
    musicinfo_t *music;
 
-   if (nomusicparm)
+   if (PLAYBACK_SKIP)
    {
+      musinfo.current_item = lumpnum;
       return;
    }
 
-   // [crispy] play no music if this is not the right map
-   if (nodrawers && singletics)
+   if (nomusicparm)
    {
-      musinfo.current_item = lumpnum;
       return;
    }