diff --git a/zeroriscy_controller.sv b/zeroriscy_controller.sv
index 0d67eecf..b6f5fae8 100644
--- a/zeroriscy_controller.sv
+++ b/zeroriscy_controller.sv
@@ -254,10 +254,7 @@ module zeroriscy_controller
 
         end else begin
           // no debug request incoming, normal execution flow
-          if (irq_req_ctrl_i)
-          begin
-            ctrl_fsm_ns  = FIRST_FETCH;
-          end
+          ctrl_fsm_ns  = FIRST_FETCH;
         end
       end
 
diff --git a/zeroriscy_core.sv b/zeroriscy_core.sv
index 7daa0423..b1e8a1f4 100644
--- a/zeroriscy_core.sv
+++ b/zeroriscy_core.sv
@@ -260,7 +260,7 @@ module zeroriscy_core
 
   assign dbg_busy    = dbg_req | dbg_csr_req | dbg_jump_req | dbg_reg_wreq | debug_req_i;
 
-  assign clock_en    = core_busy | dbg_busy | (irq_i & m_irq_enable);
+  assign clock_en    = core_busy | dbg_busy | irq_i;
 
   assign sleeping    = (~core_busy);