diff --git a/openair1/PHY/defs_gNB.h b/openair1/PHY/defs_gNB.h
index 5c3a5490af..1e62e51c2a 100644
--- a/openair1/PHY/defs_gNB.h
+++ b/openair1/PHY/defs_gNB.h
@@ -538,7 +538,10 @@ typedef struct {
 #define MAX_NUM_NR_RX_PRACH_PREAMBLES 4
 #define MAX_UL_PDUS_PER_SLOT 8
 #define MAX_NUM_NR_SRS_PDUS 8
-#define MAX_NUM_NR_UCI_PDUS 8
+// the current RRC resource allocation is that each UE gets its
+// "own" PUCCH resource (for F0) in a dedicated PRB in each slot
+// therefore, we can have up to "number of UE" UCI PDUs
+#define MAX_NUM_NR_UCI_PDUS MAX_MOBILES_PER_GNB
 
 /// Top-level PHY Data Structure for gNB
 typedef struct PHY_VARS_gNB_s {