diff --git a/hw/rtl/VX_cluster.v b/hw/rtl/VX_cluster.v
index 466512e7..ea9a766b 100644
--- a/hw/rtl/VX_cluster.v
+++ b/hw/rtl/VX_cluster.v
@@ -120,7 +120,7 @@ module VX_cluster #(
         .DATA_WIDTH   (32),
         .ADDR_WIDTH   (12),
         .BUFFERED_REQ (1), 
-        .BUFFERED_RSP (`NUM_CORES >= 4)
+        .BUFFERED_RSP (1)
     ) csr_arb (
         .clk            (clk),
         .reset          (reset),
@@ -225,7 +225,7 @@ module VX_cluster #(
             .DATA_WIDTH    (`L2DRAM_LINE_WIDTH),            
             .TAG_IN_WIDTH  (`XDRAM_TAG_WIDTH),
             .TAG_OUT_WIDTH (`L2DRAM_TAG_WIDTH),
-            .BUFFERED_REQ  (`NUM_CORES >= 4),
+            .BUFFERED_REQ  (1),
             .BUFFERED_RSP  (1)
         ) dram_arb (
             .clk            (clk),
diff --git a/hw/rtl/Vortex.v b/hw/rtl/Vortex.v
index 17c67db5..2f2d34e9 100644
--- a/hw/rtl/Vortex.v
+++ b/hw/rtl/Vortex.v
@@ -121,7 +121,7 @@ module Vortex (
         .NUM_REQS     (`NUM_CLUSTERS),
         .DATA_WIDTH   (32),
         .ADDR_WIDTH   (12),
-        .BUFFERED_REQ (`NUM_CLUSTERS >= 4),
+        .BUFFERED_REQ (1),
         .BUFFERED_RSP (1)
     ) csr_arb (
         .clk            (clk),
@@ -228,7 +228,7 @@ module Vortex (
             .TAG_IN_WIDTH  (`L2DRAM_TAG_WIDTH),
             .TAG_OUT_WIDTH (`L3DRAM_TAG_WIDTH),
             .BUFFERED_REQ  (1),
-            .BUFFERED_RSP  (`NUM_CLUSTERS >= 4)
+            .BUFFERED_RSP  (1)
         ) dram_arb (
             .clk            (clk),
             .reset          (reset),