diff --git a/src/isa/riscv64/system/trigger.c b/src/isa/riscv64/system/trigger.c
index 18d3ea4e7..37a30658f 100644
--- a/src/isa/riscv64/system/trigger.c
+++ b/src/isa/riscv64/system/trigger.c
@@ -324,9 +324,10 @@ void trigger_handler(const trig_type_t type, const trig_action_t action, word_t
           if (!trigger_reentrancy_check()) {
             break;
           }
-        case TRIG_TYPE_ICOUNT:
+        case TRIG_TYPE_ICOUNT: {
           extern Decode *prev_s;
           prev_s->pc = cpu.pc;
+        }
         case TRIG_TYPE_MCONTROL:
         case TRIG_TYPE_MCONTROL6:
           trigger_action = action;