diff --git a/debugger/gdbmidebugger.pp b/debugger/gdbmidebugger.pp
index c83e431f0f..c478619aa7 100644
--- a/debugger/gdbmidebugger.pp
+++ b/debugger/gdbmidebugger.pp
@@ -3786,6 +3786,13 @@ end;
 
 procedure TGDBMIDebugger.Done;
 begin
+  if State = dsDestroying
+  then begin
+    ClearCommandQueue;
+    inherited Done;
+    exit;
+  end;
+
   LockRelease;
   try
     CancelAllQueued;