diff --git a/src/compressed_decoder.sv b/src/compressed_decoder.sv
index 25c12be4e..a0ad5b755 100644
--- a/src/compressed_decoder.sv
+++ b/src/compressed_decoder.sv
@@ -253,5 +253,10 @@ module compressed_decoder
             // normal instruction
             default: is_compressed_o = 1'b0;
         endcase
+
+        // Check if the instruction was illegal, if it was then output the offending instruction (zero-extended)
+        if (illegal_instr_o && is_compressed_o) begin
+            instr_o = instr_i;
+        end
     end
-endmodule
\ No newline at end of file
+endmodule
diff --git a/tb b/tb
index fc8ec3687..bccd31aeb 160000
--- a/tb
+++ b/tb
@@ -1 +1 @@
-Subproject commit fc8ec368795f381a76ff200d5eed0d523ea9542d
+Subproject commit bccd31aeb6ddd031c37088201a883ce01723a6b6