diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
index 5699c791e4..187d94b1a2 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.cs
@@ -712,7 +712,7 @@ namespace BizHawk.Client.EmuHawk
 					Close();
 				}
 
-				if (_windowClosedAndSafeToExitProcess)
+				if (IsDisposed || _windowClosedAndSafeToExitProcess)
 				{
 					break;
 				}