diff --git a/plugins/HardwareBreakpoints/HardwareBreakpoints.cpp b/plugins/HardwareBreakpoints/HardwareBreakpoints.cpp
index cab58a23e..83bf4ff20 100644
--- a/plugins/HardwareBreakpoints/HardwareBreakpoints.cpp
+++ b/plugins/HardwareBreakpoints/HardwareBreakpoints.cpp
@@ -165,7 +165,8 @@ void HardwareBreakpoints::setupBreakpoints() {
 				thread->getState(&state);
 
 				for (int i = 0; i < RegisterCount; ++i) {
-					if (ok[i]) {
+					const BreakpointState bp_state = breakpoint_state(&state, i);
+					if (ok[i] || bp_state.enabled) {
 						set_breakpoint_state(
 							&state,
 							i,