diff --git a/config/shared/config-shared.vh b/config/shared/config-shared.vh
index 7e3193e1c..37fe0febc 100644
--- a/config/shared/config-shared.vh
+++ b/config/shared/config-shared.vh
@@ -17,7 +17,7 @@ localparam ASID_BASE = (XLEN==32 ? 32'd22 : 32'd44);
 localparam ASID_BITS = (XLEN==32 ? 32'd9 : 32'd16);
 
 // Debug Module implemented                                                                                                          
-localparam logic DEBUG_SUPPORTED = 1'b1;
+localparam logic DEBUG_SUPPORTED = 1'b0;
 
 // constants to check SATP_MODE against
 // defined in Table 4.3 of the privileged spec
diff --git a/src/debug/tap.sv b/src/debug/tap.sv
index 74ec6ad8e..b76afca8f 100644
--- a/src/debug/tap.sv
+++ b/src/debug/tap.sv
@@ -82,7 +82,7 @@ module tap (
 
   always @(negedge tck) begin
     resetn <= ~(State == TLReset);
-    tdo_en <= State == ShiftIR || State == ShiftDR;
+    tdo_en <= State == ShiftIR | State == ShiftDR;
     captureIR <= State == CaptureIR;
     updateIR <= State == UpdateIR;
     shiftDR <= State == ShiftDR;