diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs
index 1e04f16981..699ab94258 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs
@@ -144,6 +144,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
 			RefreshMemoryCallbacks();
 
 			api.AsyncExecuteEmulator();
+
+			// Hack: Saving a state on frame 0 has been shown to not be sync stable. Advance past that frame to avoid the problem.
+			// Advancing 2 frames was chosen to deal with a problem with the dynamic recompiler. The dynarec seems to take 2 frames to set 
+			// things up correctly. If a state is loaded on frames 0 or 1 mupen tries to access null pointers and the emulator crashes, so instead
+ 			// advance past both to again avoid the problem.
+			api.frame_advance();
+			api.frame_advance();
+
 			SetControllerButtons();
 		}
 
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeAPI/mupen64plusCoreApi.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeAPI/mupen64plusCoreApi.cs
index 13788635fe..ddf441c503 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeAPI/mupen64plusCoreApi.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeAPI/mupen64plusCoreApi.cs
@@ -600,17 +600,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi
 
 		public void LoadState(byte[] buffer)
 		{
-			// This is a dirty hack...
-			// When using the dynamic recompiler if a state is loaded too early some pointers are not set up yet, so mupen
-			// tries to access null pointers and the emulator crashes. It seems like it takes 2 frames to fully set up the recompiler,
-			// so if two frames haven't been run yet, run them, then load the state.
-
-			if (bizhawkCore.Frame < 2)
-			{
-				frame_advance();
-				frame_advance();
-			}
-			
 			m64pCoreLoadState(buffer);
 		}