diff --git a/source/ngc/fceugx.c b/source/ngc/fceugx.c
index 19fe883..b02f2c0 100644
--- a/source/ngc/fceugx.c
+++ b/source/ngc/fceugx.c
@@ -140,18 +140,20 @@ int main(int argc, char *argv[])
 		selectedMenu = 1; // change to preferences menu
 	}
 
+	FCEUI_SetSoundQuality(1); // 0 - low, 1 - high, 2 - high (alt.)
+	FCEUI_SetVidSystem(GCSettings.timing); // causes a small 'pop' in the audio
+
     while (1) // main loop
     {
     	ResetVideo_Menu();
     	MainMenu(selectedMenu);
 		selectedMenu = 2; // return to game menu from now on
 
-		setFrameTimer(); // set frametimer method before emulation
-		FCEUI_SetVidSystem(GCSettings.timing);
-		SetPalette();
-		FCEUI_SetSoundQuality(1); // 0 - low, 1 - high, 2 - high (alt.)
 		ResetVideo_Emu();
 
+		setFrameTimer(); // set frametimer method before emulation
+		SetPalette();
+
 		static int fskipc=0;
 
 		while(1) // emulation loop
diff --git a/source/ngc/gcaudio.c b/source/ngc/gcaudio.c
index d5926b8..03c0676 100644
--- a/source/ngc/gcaudio.c
+++ b/source/ngc/gcaudio.c
@@ -98,8 +98,6 @@ void StopAudio()
 {
 	AUDIO_StopDMA();
 	IsPlaying = 0;
-	mixhead = mixtail = 0;
-	memset(soundbuffer, 0, 3840*2);
 }
 
 /****************************************************************************
diff --git a/source/ngc/menu.c b/source/ngc/menu.c
index f737f13..7816fe0 100644
--- a/source/ngc/menu.c
+++ b/source/ngc/menu.c
@@ -179,6 +179,7 @@ VideoOptions ()
 
 			case 4: // timing
 				GCSettings.timing ^= 1;
+				FCEUI_SetVidSystem(GCSettings.timing); // causes a small 'pop' in the audio
 				break;
 
 			case 5: // 8 sprite limit