diff --git a/hw/rtl/VX_config.vh b/hw/rtl/VX_config.vh
index a5f61679..f0910b2b 100644
--- a/hw/rtl/VX_config.vh
+++ b/hw/rtl/VX_config.vh
@@ -278,7 +278,7 @@
 
 // Size of LSU Request Queue
 `ifndef LSUQ_SIZE
-`define LSUQ_SIZE   (8 * (`NUM_THREADS / `NUM_LSU_LANES))
+`define LSUQ_SIZE   (4 * `NUM_WARPS * (`NUM_THREADS / `NUM_LSU_LANES))
 `endif
 
 // LSU Duplicate Address Check
diff --git a/hw/rtl/VX_platform.vh b/hw/rtl/VX_platform.vh
index 64338e49..091e5d14 100644
--- a/hw/rtl/VX_platform.vh
+++ b/hw/rtl/VX_platform.vh
@@ -35,7 +35,6 @@
 `define NUM_CORES 2
 `define NUM_THREADS 8
 `define NUM_WARPS 8
-`endif
 
 `define FIRESIM
 `endif // SYNTHESIS