diff --git a/src/d_main.c b/src/d_main.c
index 7368383b57c2e32e96df3b6df11f80673f53ca60..4cdfb13d92b87c03697fba302442b0604549b065 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1223,8 +1223,16 @@ void D_SRB2Main(void)
 	CONS_Printf("R_Init(): Init SRB2 refresh daemon.\n");
 	R_Init();
 
-	// setting up sound
-	CONS_Printf("S_Init(): Setting up sound.\n");
+	// setting up sound	
+	if (dedicated)
+	{
+		nosound = true;
+		nomidimusic = nodigimusic = true;
+	}
+	else
+	{
+		CONS_Printf("S_Init(): Setting up sound.\n");
+	}
 	if (M_CheckParm("-nosound"))
 		nosound = true;
 	if (M_CheckParm("-nomusic")) // combines -nomidimusic and -nodigmusic
diff --git a/src/sdl/sdl_sound.c b/src/sdl/sdl_sound.c
index 1a2cabd23b1845feeea81907b10b9ffe02e05456..6c70c163b0c041c8c4dec78656e38ec3126f2176 100644
--- a/src/sdl/sdl_sound.c
+++ b/src/sdl/sdl_sound.c
@@ -1180,12 +1180,6 @@ void I_StartupSound(void)
 	audio.callback = I_UpdateStream;
 	audio.userdata = &localdata;
 
-	if (dedicated)
-	{
-		nosound = nomidimusic = nodigimusic = true;
-		return;
-	}
-
 	// Configure sound device
 	CONS_Printf("I_StartupSound:\n");
 
@@ -1481,9 +1475,6 @@ void I_InitMusic(void)
 	I_AddExitFunc(I_ShutdownGMEMusic);
 #endif
 
-	if ((nomidimusic && nodigimusic) || dedicated)
-		return;
-
 #ifdef HAVE_MIXER
 	MIX_VERSION(&MIXcompiled)
 	MIXlinked = Mix_Linked_Version();