diff --git a/src/main/scala/vexriscv/plugin/CsrPlugin.scala b/src/main/scala/vexriscv/plugin/CsrPlugin.scala
index 40f6a6e..2516598 100644
--- a/src/main/scala/vexriscv/plugin/CsrPlugin.scala
+++ b/src/main/scala/vexriscv/plugin/CsrPlugin.scala
@@ -1231,7 +1231,7 @@ class CsrPlugin(val config: CsrPluginConfig) extends Plugin[VexRiscv] with Excep
         code.addTag(Verilator.public)
 
         if(withPrivilegedDebug) {
-          valid clearWhen(!debug.dcsr.stepie)
+          valid clearWhen(debug.dcsr.step && !debug.dcsr.stepie)
           valid setWhen(debug.doHalt)
         }
       }