diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index ab3201c5c..a58aff3fe 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -3955,6 +3955,7 @@ static void Command_RestartAudio_f(void)
 		return;
 
 	S_StopMusic();
+	S_StopSounds();
 	I_ShutdownMusic();
 	I_ShutdownSound();
 	I_StartupSound();
diff --git a/src/m_menu.c b/src/m_menu.c
index 63794c529..c9adbfb9c 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -6953,7 +6953,6 @@ static void M_ToggleSFX(void)
 	if (sound_disabled)
 	{
 		sound_disabled = false;
-		I_StartupSound();
 		S_InitSfxChannels(cv_soundvolume.value);
 		S_StartSound(NULL, sfx_strpst);
 		M_StartMessage(M_GetText("SFX Enabled\n"), NULL, MM_NOTHING);
diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index f39d375ef..72217482f 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -82,7 +82,10 @@ void I_StartupSound(void)
 
 	// EE inits audio first so we're following along.
 	if (SDL_WasInit(SDL_INIT_AUDIO) == SDL_INIT_AUDIO)
-		CONS_Printf("SDL Audio already started\n");
+	{
+		CONS_Debug(DBG_DETAILED, "SDL Audio already started\n");
+		return;
+	}
 	else if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0)
 	{
 		CONS_Alert(CONS_ERROR, "Error initializing SDL Audio: %s\n", SDL_GetError());