diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index b522f16da8..0168e432b0 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -164,6 +164,7 @@ namespace BizHawk.MultiClient
 			Global.Emulator = new NullEmulator();
 			Global.ActiveController = Global.NullControls;
 			Global.AutoFireController = Global.AutofireNullControls;
+			Global.AutofireStickyXORAdapter.SetOnOffPatternFromConfig();
 #if WINDOWS
 			Global.Sound = new Sound(Handle, Global.DSound);
 #else
diff --git a/BizHawk.MultiClient/config/AutofireConfig.cs b/BizHawk.MultiClient/config/AutofireConfig.cs
index 0f0ad10d92..92c5d1daf7 100644
--- a/BizHawk.MultiClient/config/AutofireConfig.cs
+++ b/BizHawk.MultiClient/config/AutofireConfig.cs
@@ -40,6 +40,7 @@ namespace BizHawk.MultiClient
 			Global.AutoFireController.On = Global.Config.AutofireOn = (int)OnNumeric.Value;
 			Global.AutoFireController.Off = Global.Config.AutofireOff = (int)OffNumeric.Value;
 			Global.Config.AutofireLagFrames = LagFrameCheck.Checked;
+			Global.AutofireStickyXORAdapter.SetOnOffPatternFromConfig();
 			this.Close();
 		}
 
diff --git a/BizHawk.MultiClient/movie/InputAdapters.cs b/BizHawk.MultiClient/movie/InputAdapters.cs
index fcecc90b3e..4ccc1ef42f 100644
--- a/BizHawk.MultiClient/movie/InputAdapters.cs
+++ b/BizHawk.MultiClient/movie/InputAdapters.cs
@@ -200,6 +200,12 @@ namespace BizHawk.MultiClient
 
 		public IController Source;
 
+		public void SetOnOffPatternFromConfig()
+		{
+			On = Global.Config.AutofireOn < 1 ? 0 : Global.Config.AutofireOn;
+			Off = Global.Config.AutofireOff < 1 ? 0 : Global.Config.AutofireOff;
+		}
+
 		public AutoFireStickyXORAdapter()
 		{
 			//On = Global.Config.AutofireOn < 1 ? 0 : Global.Config.AutofireOn;