diff --git a/debugger/gdbmidebugger.pp b/debugger/gdbmidebugger.pp
index f5929620a5..d5e45e48d7 100644
--- a/debugger/gdbmidebugger.pp
+++ b/debugger/gdbmidebugger.pp
@@ -849,7 +849,10 @@ end;
 procedure TGDBMIDebugger.DoState(const OldState: TDBGState);
 begin
   if State in [dsStop, dsError]
-  then FAsmCache.Clear;
+  then begin
+    FAsmCache.Clear;
+    FPauseWaitState := pwsNone;
+  end;
 
   inherited DoState(OldState);
 end;