diff --git a/common/emu.c b/common/emu.c
index cc450d8..507437a 100644
--- a/common/emu.c
+++ b/common/emu.c
@@ -1373,6 +1373,7 @@ void emu_loop(void)
 	// prepare CD buffer
 	if (PicoAHW & PAHW_MCD)
 		PicoCDBufferInit();
+	PicoLoopPrepare();
 
 	pemu_loop_prep();
 
diff --git a/common/menu.c b/common/menu.c
index 8673784..4393ed5 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -1689,10 +1689,6 @@ static int menu_loop_options(menu_id id, int keys)
 
 	me_loop(e_menu_options, &sel, NULL);
 
-	if (PicoRegionOverride)
-		// force setting possibly changed..
-		Pico.m.pal = (PicoRegionOverride == 2 || PicoRegionOverride == 8) ? 1 : 0;
-
 	return 0;
 }