diff --git a/components/fpdebug/fpdbgclasses.pp b/components/fpdebug/fpdbgclasses.pp
index 4f4e890cd9..1b344f5166 100644
--- a/components/fpdebug/fpdbgclasses.pp
+++ b/components/fpdebug/fpdbgclasses.pp
@@ -1469,7 +1469,7 @@ var
   Brk: TBreakLocationEntry;
 begin
   for Brk in Self do begin
-    if (Brk.Location >= AAdress) and (Brk.Location < (AAdress+ASize)) then
+    if (not Brk.ErrorSetting) and (Brk.Location >= AAdress) and (Brk.Location < (AAdress+ASize)) then
       PByte(@AData)[Brk.Location-AAdress] := Brk.OrigValue;
   end;
 end;