diff --git a/src/m_misc.c b/src/m_misc.c
index ce1c9f74..502141ae 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -2256,8 +2256,8 @@ default_t defaults[] = {
   {
     "parallel_sfx_limit",
     (config_t *) &parallel_sfx_limit, NULL,
-    {3}, {1, MAX_CHANNELS}, number, ss_none, wad_no,
-    "parallel same-sound limit"
+    {4}, {1, MAX_CHANNELS}, number, ss_none, wad_no,
+    "parallel same-sound limit (MAX_CHANNELS = disable)"
   },
 
   // [FG] music backend
diff --git a/src/s_sound.c b/src/s_sound.c
index e8d47c23..14e6ca0c 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -250,7 +250,7 @@ static int S_CompareChannels(const void *arg_a, const void *arg_b)
 }
 
 // How many instances of the same sfx can be playing concurrently
-int parallel_sfx_limit = 3;
+int parallel_sfx_limit;
 
 //
 // S_getChannel :
@@ -609,11 +609,6 @@ void S_SetMusicVolume(int volume)
       I_Error("Attempt to set music volume at %d\n", volume);
 #endif
 
-   // haleyjd: I don't think it should do this in SDL
-#if 0
-   I_SetMusicVolume(127);
-#endif
-
    I_SetMusicVolume(volume);
    snd_MusicVolume = volume;
 }