diff --git a/components/fpdebug/fpdbgclasses.pp b/components/fpdebug/fpdbgclasses.pp
index f8481f12f3..7d2346d006 100644
--- a/components/fpdebug/fpdbgclasses.pp
+++ b/components/fpdebug/fpdbgclasses.pp
@@ -650,6 +650,11 @@ end;
 
 function TDbgProcess.AddBreak(const ALocation: TDbgPtr): TDbgBreakpoint;
 begin
+  if FBreakMap.HasId(ALocation) then begin
+    debugln(['TDbgProcess.AddBreak breakpoint already exists at ', dbgs(ALocation)]);
+    Result := nil;
+    exit;
+  end;
   Result := OSDbgClasses.DbgBreakpointClass.Create(Self, ALocation);
   FBreakMap.Add(ALocation, Result);
   if (GetInstructionPointerRegisterValue=ALocation) and not assigned(FCurrentBreakpoint) then