diff --git a/core/cache_subsystem/axi_adapter.sv b/core/cache_subsystem/axi_adapter.sv
index 80ae24220f..28e441d910 100644
--- a/core/cache_subsystem/axi_adapter.sv
+++ b/core/cache_subsystem/axi_adapter.sv
@@ -492,7 +492,7 @@ module axi_adapter #(
       // assert WACK the cycle after the BVALID/BREADY handshake is finished
       wack_d = axi_req_o.b_ready & axi_resp_i.b_valid;
       // assert RACK the cycle after the RVALID/RREADY handshake is finished
-      rack_d = axi_req_o.r_ready & axi_resp_i.r_valid;
+      rack_d = axi_req_o.r_ready & axi_resp_i.r_valid & axi_resp_i.r.last;
     end
 
     always_ff @(posedge clk_i or negedge rst_ni) begin
diff --git a/core/cache_subsystem/std_cache_subsystem.sv b/core/cache_subsystem/std_cache_subsystem.sv
index f00561d3c9..5113cff765 100644
--- a/core/cache_subsystem/std_cache_subsystem.sv
+++ b/core/cache_subsystem/std_cache_subsystem.sv
@@ -276,7 +276,6 @@ module std_cache_subsystem
   );
 
   assign axi_sort_req = {axi_req_icache, axi_req_bypass, axi_req_data};
-  assign axi_req_o.wack = axi_sort_req[w_select_arbiter].wack;
 
   // Route responses based on ID
   // 0000 -> I$
@@ -309,7 +308,15 @@ module std_cache_subsystem
       .oup_ready_i({axi_req_icache.r_ready, axi_req_bypass.r_ready, axi_req_data.r_ready})
   );
 
-  assign axi_req_o.rack = axi_sort_req[r_select].rack;
+  // RACK
+  logic [1:0] rack_select;
+
+  always_ff @(posedge clk_i or negedge rst_ni) begin
+      if (!rst_ni) rack_select <= '0;
+      else         rack_select <= r_select;
+  end
+
+  assign axi_req_o.rack = axi_sort_req[rack_select].rack;
 
   // B Channel
   logic [1:0] b_select;
@@ -338,6 +345,15 @@ module std_cache_subsystem
       .oup_ready_i({axi_req_icache.b_ready, axi_req_bypass.b_ready, axi_req_data.b_ready})
   );
 
+  //WACK
+  logic [1:0] wack_select;
+
+  always_ff @(posedge clk_i or negedge rst_ni) begin
+      if (!rst_ni) wack_select <= '0;
+      else         wack_select <= b_select;
+  end
+  assign axi_req_o.wack = axi_sort_req[wack_select].wack;
+
   ///////////////////////////////////////////////////////
   // assertions
   ///////////////////////////////////////////////////////