diff --git a/ForceStep/BreakpointManager.cs b/ForceStep/BreakpointManager.cs
index 417a163..d3bdbbd 100644
--- a/ForceStep/BreakpointManager.cs
+++ b/ForceStep/BreakpointManager.cs
@@ -46,7 +46,7 @@ private void SuspendBreakpoints(string statusCode)
 
             foreach (EnvDTE.Breakpoint bp in dte.Debugger.Breakpoints)
             {
-                if (bp.Enabled)
+                if (bp.Enabled && ((EnvDTE80.Breakpoint2)bp).BreakWhenHit)
                 {
                     bp.Tag = statusCode;
                     bp.Enabled = false;