diff --git a/hw/rtl/VX_csr_pipe.v b/hw/rtl/VX_csr_pipe.v
index 52b6ff94..dd80a811 100644
--- a/hw/rtl/VX_csr_pipe.v
+++ b/hw/rtl/VX_csr_pipe.v
@@ -77,6 +77,6 @@ module VX_csr_pipe #(
                                                                    csr_read_data_s2;
     end     
 
-    assign stall_gpr_csr = no_slot_csr;   
+    assign stall_gpr_csr = no_slot_csr && csr_req_if.is_csr && (| csr_req_if.valid);   
 
 endmodule