diff --git a/prboom2/src/p_setup.c b/prboom2/src/p_setup.c
index a0c91ecf0..05c534181 100644
--- a/prboom2/src/p_setup.c
+++ b/prboom2/src/p_setup.c
@@ -3677,10 +3677,7 @@ void P_SetupLevel(int episode, int map, int playermask, int skill)
   lumpnum = W_GetNumForName(lumpname);
 
   // Must process musinfo to get default track before calling S_Start
-  if (gamemode != shareware)
-  {
-    S_ParseMusInfo(lumpname);
-  }
+  S_ParseMusInfo(lumpname);
 
   // Make sure all sounds are stopped before Z_FreeTag.
   S_Start();
diff --git a/prboom2/src/s_advsound.c b/prboom2/src/s_advsound.c
index 3566757b5..a207ffce1 100644
--- a/prboom2/src/s_advsound.c
+++ b/prboom2/src/s_advsound.c
@@ -59,7 +59,7 @@ musinfo_t musinfo;
 //
 void S_ParseMusInfo(const char *mapid)
 {
-  if (W_LumpNameExists("MUSINFO"))
+  if (gamemode != shareware && W_LumpNameExists("MUSINFO"))
   {
     int num, lumpnum;
     int inMap = false;