diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index 53574ac2e9..60ef179031 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -1787,8 +1787,8 @@ namespace BizHawk.Client.EmuHawk
 
 			N64CircularAnalogRangeMenuItem.Checked = Global.Config.N64UseCircularAnalogConstraint;
 
-			var ss = (N64SyncSettings)Global.Emulator.GetSyncSettings();
-			MupenStyleLagMenuItem.Checked = ss.UseMupenStyleLag;
+			var s = (N64Settings)Global.Emulator.GetSettings();
+			MupenStyleLagMenuItem.Checked = s.UseMupenStyleLag;
 		}
 
 		private void N64PluginSettingsMenuItem_Click(object sender, EventArgs e)
@@ -1831,9 +1831,9 @@ namespace BizHawk.Client.EmuHawk
 
 		private void MupenStyleLagMenuItem_Click(object sender, EventArgs e)
 		{
-			var ss = (N64SyncSettings)Global.Emulator.GetSyncSettings();
-			ss.UseMupenStyleLag ^= true;
-			Global.Emulator.PutSyncSettings(ss);
+			var s = (N64Settings)Global.Emulator.GetSettings();
+			s.UseMupenStyleLag ^= true;
+			Global.Emulator.PutSettings(s);
 		}
 
 		#endregion
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs
index 5864b707d5..2f2cad87dc 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs
@@ -240,7 +240,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
 		{
 			get
 			{
-				if (_syncSettings.UseMupenStyleLag)
+				if (_settings.UseMupenStyleLag)
 				{
 					return !IsVIFrame;
 				}
@@ -250,7 +250,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
 
 			set
 			{
-				if (_syncSettings.UseMupenStyleLag)
+				if (_settings.UseMupenStyleLag)
 				{
 					IsVIFrame = !value;
 				}
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64Settings.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64Settings.cs
index 70d3bc6b62..1d24e02535 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64Settings.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64Settings.cs
@@ -5,12 +5,16 @@
 		public int VideoSizeX = 320;
 		public int VideoSizeY = 240;
 
+		public bool UseMupenStyleLag { get; set; }
+
 		public N64Settings Clone()
 		{
 			return new N64Settings
 			{
 				VideoSizeX = VideoSizeX,
 				VideoSizeY = VideoSizeY,
+
+				UseMupenStyleLag = UseMupenStyleLag
 			};
 		}
 	}
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.cs
index 0d8863b121..554262b5e5 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.cs
@@ -29,8 +29,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
 			JaboPlugin = new N64JaboPluginSettings();
 		}
 
-		public bool UseMupenStyleLag { get; set; }
-
 		public CoreType Core { get; set; }
 		public RspType Rsp { get; set; }
 		public PluginType VideoPlugin  { get; set; }