diff --git a/hw/ip/hmac/rtl/hmac.sv b/hw/ip/hmac/rtl/hmac.sv
index 42ae127..1098cf0 100644
--- a/hw/ip/hmac/rtl/hmac.sv
+++ b/hw/ip/hmac/rtl/hmac.sv
@@ -174,7 +174,7 @@
   assign msg_fifo_rvalid = msg_fifo_req & ~msg_fifo_we;
   assign msg_fifo_rdata  = '1;  // Return all F
   assign msg_fifo_rerror = '1;  // Return error for read access
-  assign msg_fifo_gnt    = msg_fifo_req & fifo_wready & ~hmac_fifo_wsel & packer_ready;
+  assign msg_fifo_gnt    = msg_fifo_req & ~hmac_fifo_wsel & packer_ready;
 
   // FIFO control
   sha_fifo_t reg_fifo_wentry;
diff --git a/hw/ip/hmac/rtl/sha2_pad.sv b/hw/ip/hmac/rtl/sha2_pad.sv
index 0765e29..368d658 100644
--- a/hw/ip/hmac/rtl/sha2_pad.sv
+++ b/hw/ip/hmac/rtl/sha2_pad.sv
@@ -84,6 +84,7 @@
           2'b 01: shaf_rdata = {fifo_rdata.data[31:24], 24'h 8000_00};
           2'b 10: shaf_rdata = {fifo_rdata.data[31:16], 16'h 8000};
           2'b 11: shaf_rdata = {fifo_rdata.data[31: 8],  8'h 80};
+          default: shaf_rdata = 32'h0;
         endcase
       end