diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java
index e362e2aec01..2abc13540e7 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java
@@ -516,6 +516,8 @@ public class BreakpointManager extends Manager {
 			setLocationBreakpoint(bkpt);
 			List blist = getBreakpointsList(target);
 			blist.add(bkpt);
+			// Force the reset of the location.
+			bkpt.setLocation(null);
 
 			// Fire a created Event.
 			MIBreakpoint[] miBreakpoints = bkpt.getMIBreakpoints();