diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 6730c61d2e..a871fa8bc4 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -534,6 +534,10 @@ namespace BizHawk.Client.EmuHawk
 				{
 					break;
 				}
+				if (Global.Config.DispSpeedupFeatures != 0)
+				{
+					Thread.Sleep(0);
+				}
 			}
 
 			Shutdown();