diff --git a/components/lazdebuggers/lazdebuggerfp/fpdebugdebugger.pas b/components/lazdebuggers/lazdebuggerfp/fpdebugdebugger.pas
index 470c127e1f..a54ad2045d 100644
--- a/components/lazdebuggers/lazdebuggerfp/fpdebugdebugger.pas
+++ b/components/lazdebuggers/lazdebuggerfp/fpdebugdebugger.pas
@@ -217,7 +217,7 @@ end;
 
 procedure TFPBreakpoint.DoStateChange(const AOldState: TDBGState);
 begin
-  if (Debugger.State = dsPause) then
+  if (Debugger.State in [dsPause, dsInit]) then
     begin
     if Enabled and not FIsSet then
       begin
@@ -666,7 +666,7 @@ end;
 procedure TFpDebugDebugger.FDbgControllerCreateProcessEvent(var continue: boolean);
 begin
   // This will trigger setting the breakpoints
-  SetState(dsPause);
+  SetState(dsInit);
 end;
 
 function TFpDebugDebugger.RequestCommand(const ACommand: TDBGCommand;