diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java
index 173b81472c6..5f7083bcdac 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java
@@ -407,12 +407,7 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana
 		else if ( cdiBreakpoint instanceof ICDILocationBreakpoint )
 			doHandleLocationBreakpointCreatedEvent( (ICDILocationBreakpoint)cdiBreakpoint );
 		if ( !cdiBreakpoint.isTemporary() && !DebugPlugin.getDefault().getBreakpointManager().isEnabled() ) {
-			try {
-				cdiBreakpoint.setEnabled( false );
-			}
-			catch( CDIException e ) {
-				// ignore
-			}
+			changeBreakpointPropertiesOnTarget(cdiBreakpoint, new Boolean(false), null);
 		}
 	}