diff --git a/src/iss/debugger/riscv_target_adapter.h b/src/iss/debugger/riscv_target_adapter.h
index 0c008d9..d8d105e 100644
--- a/src/iss/debugger/riscv_target_adapter.h
+++ b/src/iss/debugger/riscv_target_adapter.h
@@ -335,6 +335,7 @@ template <typename ARCH> status riscv_target_adapter<ARCH>::add_break(break_type
     switch(type) {
     default:
         return Err;
+    case SW_EXEC:
     case HW_EXEC: {
         auto saddr = map_addr({iss::access_type::FETCH, iss::address_type::PHYSICAL, 0, addr});
         auto eaddr = map_addr({iss::access_type::FETCH, iss::address_type::PHYSICAL, 0, addr + length});
@@ -351,6 +352,7 @@ template <typename ARCH> status riscv_target_adapter<ARCH>::remove_break(break_t
     switch(type) {
     default:
         return Err;
+    case SW_EXEC:
     case HW_EXEC: {
         auto saddr = map_addr({iss::access_type::FETCH, iss::address_type::PHYSICAL, 0, addr});
         unsigned handle = target_adapter_base::bp_lut.getEntry(saddr.val);