diff --git a/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c b/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
index 0d21ba9302..9323a9da85 100644
--- a/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
+++ b/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
@@ -548,7 +548,7 @@ static void deliver_sdu_srb(void *_ue, nr_pdcp_entity_t *entity,
   int srb_id;
   int i;
 
-  for (i = 0; i < 3; i++) {
+  for (i = 0; i < 2; i++) {
     if (entity == ue->srb[i]) {
       srb_id = i+1;
       goto srb_found;
@@ -591,7 +591,7 @@ static void deliver_pdu_srb(void *_ue, nr_pdcp_entity_t *entity,
   int i;
   mem_block_t *memblock;
 
-  for (i = 0; i < 3; i++) {
+  for (i = 0; i < 2; i++) {
     if (entity == ue->srb[i]) {
       srb_id = i+1;
       goto srb_found;
@@ -1096,7 +1096,7 @@ void pdcp_config_set_security(
 
   /* TODO: proper handling of DRBs, for the moment only SRBs are handled */
 
-  if (rb_id >= 1 && rb_id <= 3) {
+  if (rb_id >= 1 && rb_id <= 2) {
     rb = ue->srb[rb_id - 1];
 
     if (rb == NULL) {
@@ -1146,7 +1146,7 @@ static boolean_t pdcp_data_req_srb(
 
   ue = nr_pdcp_manager_get_ue(nr_pdcp_ue_manager, rnti);
 
-  if (rb_id < 1 || rb_id > 3)
+  if (rb_id < 1 || rb_id > 2)
     rb = NULL;
   else
     rb = ue->srb[rb_id - 1];
diff --git a/openair2/LAYER2/nr_pdcp/nr_pdcp_ue_manager.h b/openair2/LAYER2/nr_pdcp/nr_pdcp_ue_manager.h
index 742e0e84be..3329f856b7 100644
--- a/openair2/LAYER2/nr_pdcp/nr_pdcp_ue_manager.h
+++ b/openair2/LAYER2/nr_pdcp/nr_pdcp_ue_manager.h
@@ -28,7 +28,7 @@ typedef void nr_pdcp_ue_manager_t;
 
 typedef struct nr_pdcp_ue_t {
   int rnti;
-  nr_pdcp_entity_t *srb[3];
+  nr_pdcp_entity_t *srb[2];
   nr_pdcp_entity_t *drb[5];
 } nr_pdcp_ue_t;