diff --git a/source/ngc/gcaudio.cpp b/source/ngc/gcaudio.cpp
index 760c7f9..21f94fc 100644
--- a/source/ngc/gcaudio.cpp
+++ b/source/ngc/gcaudio.cpp
@@ -116,18 +116,18 @@ SwitchAudioMode(int mode)
 	{
 		#ifndef NO_SOUND
 		ASND_Pause(1);
-		#endif
 		AUDIO_StopDMA();
-		AUDIO_SetDSPSampleRate(AI_SAMPLERATE_48KHZ);
 		AUDIO_RegisterDMACallback(AudioSwitchBuffers);
+		#endif
 	}
 	else // menu
 	{
 		IsPlaying = 0;
-		AUDIO_StopDMA();
 		#ifndef NO_SOUND
-		ASND_SetDMACallback();
+		ASND_Init();
 		ASND_Pause(0);
+		#else
+		AUDIO_StopDMA();
 		#endif
 	}
 }
@@ -140,12 +140,7 @@ SwitchAudioMode(int mode)
  ***************************************************************************/
 void ShutdownAudio()
 {
-	#ifndef NO_SOUND
-	ASND_Pause(1);
-	ASND_End();
-	#endif
 	AUDIO_StopDMA();
-	AUDIO_RegisterDMACallback(NULL);
 }
 
 /****************************************************************************