diff --git a/debugger/gdbmidebugger.pp b/debugger/gdbmidebugger.pp
index c014f602ad..6d67a44662 100644
--- a/debugger/gdbmidebugger.pp
+++ b/debugger/gdbmidebugger.pp
@@ -1971,6 +1971,8 @@ var
   Cmd: TGDBMIDebuggerCommand;
   SavedInExecuteCount: LongInt;
 begin
+  if FCommandQueue.Count = 0
+  then exit;
   SavedInExecuteCount := FInExecuteCount;
   LockRelease;
   try