diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 08bc369861..3ec680ec56 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -61,7 +61,6 @@ namespace BizHawk.MultiClient
 
 		Throttle throttle;
 		bool unthrottled = false;
-		bool maxturbo = false;
 
 		//For handling automatic pausing when entering the menu
 		private bool wasPaused = false;
diff --git a/BizHawk.MultiClient/Throttle.cs b/BizHawk.MultiClient/Throttle.cs
index 885a75b432..363eed65e0 100644
--- a/BizHawk.MultiClient/Throttle.cs
+++ b/BizHawk.MultiClient/Throttle.cs
@@ -20,9 +20,49 @@ namespace BizHawk.MultiClient
 		public bool signal_unthrottle;
 		public bool signal_continuousframeAdvancing; //continuousframeAdvancing
 
-		public int cfg_frameskiprate { get { return Global.Config.FrameSkip; } }
-		public bool cfg_frameLimit { get { return Global.Config.LimitFramerate; } }
-		public bool cfg_autoframeskipenab { get { return Global.Config.AutoMinimizeSkipping; } }
+		public int cfg_frameskiprate
+		{
+			get
+			{
+				if (Global.ClientControls["MaxTurbo"])
+				{
+					return 20;
+				}
+				else
+				{
+					return Global.Config.FrameSkip;
+				}
+			}
+		}
+		public bool cfg_frameLimit
+		{
+			get 
+			{
+				if (Global.ClientControls["MaxTurbo"])
+				{
+					return false;
+				}
+				else
+				{
+					return Global.Config.LimitFramerate; 
+				}
+			}
+		}
+
+		public bool cfg_autoframeskipenab
+		{
+			get
+			{
+				if (Global.ClientControls["MaxTurbo"])
+				{
+					return false;
+				}
+				else
+				{
+					return Global.Config.AutoMinimizeSkipping;
+				}
+			}
+		}
 
 		public void Step(bool allowSleep, int forceFrameSkip)
 		{