diff --git a/components/lazdebuggers/lazdebuggerfp/fpdebugdebugger.pas b/components/lazdebuggers/lazdebuggerfp/fpdebugdebugger.pas
index 1b2cdeae16..dc36cfd78f 100644
--- a/components/lazdebuggers/lazdebuggerfp/fpdebugdebugger.pas
+++ b/components/lazdebuggers/lazdebuggerfp/fpdebugdebugger.pas
@@ -3084,6 +3084,8 @@ begin
     Opts := TFpDebugDebuggerProperties(GetProperties).HandleDebugBreakInstruction;
     if not (dboIgnoreAll in Opts) then begin
       &continue:=False;
+      if not AMoreHitEventsPending then
+        ALocationAddr := GetLocation;
     end;
     if  continue then
       exit;