diff --git a/riscv/execute.cc b/riscv/execute.cc
index b093e72c..76f03226 100644
--- a/riscv/execute.cc
+++ b/riscv/execute.cc
@@ -281,7 +281,7 @@ void processor_t::step(size_t n)
         for (auto ic_entry = _mmu->access_icache(pc); ; ) {
           auto fetch = ic_entry->data;
           pc = execute_insn_fast(this, pc, fetch);
-          ic_entry = ic_entry->next;
+          ic_entry = &_mmu->icache[_mmu->icache_index(pc)];
           if (unlikely(ic_entry->tag != pc))
             break;
           if (unlikely(instret + 1 == n))