diff --git a/rtl/riscv-dbg/dmi_jtag.sv b/rtl/riscv-dbg/dmi_jtag.sv
index 577c3fd0..7226b5fd 100644
--- a/rtl/riscv-dbg/dmi_jtag.sv
+++ b/rtl/riscv-dbg/dmi_jtag.sv
@@ -58,6 +58,7 @@ module dmi_jtag #(
   logic tdi;
 
   logic dtmcs_select;
+  dm::dtmcs_t dtmcs_d, dtmcs_q;
 
   assign dmi_clear = jtag_dmi_clear || (dtmcs_select && update && dtmcs_q.dmihardreset);
 
@@ -65,7 +66,6 @@ module dmi_jtag #(
   // Debug Module Control and Status
   // -------------------------------
 
-  dm::dtmcs_t dtmcs_d, dtmcs_q;
 
   always_comb begin
     dtmcs_d = dtmcs_q;