diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs
index 9662511291..7f241d5ba3 100644
--- a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs
+++ b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs
@@ -87,6 +87,11 @@ namespace BizHawk.Client.EmuHawk
 		{
 			SaveConfigSettings();
 
+			if (Core.CpuTraceAvailable())
+			{
+				Core.Tracer.Enabled = false;
+			}
+
 			BreakPointControl1.Shutdown();
 		}