diff --git a/src/main/scala/vexriscv/plugin/CsrPlugin.scala b/src/main/scala/vexriscv/plugin/CsrPlugin.scala
index fa80e78..4091be6 100644
--- a/src/main/scala/vexriscv/plugin/CsrPlugin.scala
+++ b/src/main/scala/vexriscv/plugin/CsrPlugin.scala
@@ -709,7 +709,7 @@ class CsrPlugin(val config: CsrPluginConfig) extends Plugin[VexRiscv] with Excep
 
       bus.running :=  running
       bus.halted  := !running
-      bus.unavailable := RegNext(ClockDomain.current.isResetActive)
+      bus.unavailable := BufferCC(ClockDomain.current.isResetActive)
       when(debugMode){
         inhibateInterrupts()
       }