diff --git a/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c b/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
index 38ad658015599c378a650ed8041892efb9756e9e..47ffd6143c27e0873bea2e448ef8e78f894f4c44 100644
--- a/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
+++ b/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
@@ -654,11 +654,11 @@ static void add_drb_am(int rnti, struct LTE_DRB_ToAddMod *s)
     exit(1);
   }
 
-  /*if (channel_id != drb_id + 2) {
+  if (channel_id != drb_id + 3) {
     LOG_E(RLC, "%s:%d:%s: todo, remove this limitation\n",
           __FILE__, __LINE__, __FUNCTION__);
     exit(1);
-  }*/
+  }
 
   logical_channel_group = *l->ul_SpecificParameters->logicalChannelGroup;
 
@@ -737,11 +737,11 @@ static void add_drb_um(int rnti, struct LTE_DRB_ToAddMod *s)
     exit(1);
   }
 
-  /*if (channel_id != drb_id + 2) {
+  if (channel_id != drb_id + 3) {
     LOG_E(RLC, "%s:%d:%s: todo, remove this limitation\n",
           __FILE__, __LINE__, __FUNCTION__);
     exit(1);
-  }*/
+  }
 
   logical_channel_group = *l->ul_SpecificParameters->logicalChannelGroup;
 
diff --git a/openair2/LAYER2/nr_rlc/nr_rlc_ue_manager.h b/openair2/LAYER2/nr_rlc/nr_rlc_ue_manager.h
index f578faaf380f4ae6712c04ceeee3a80de2ae476b..3683e50abcf501eccd1e1dadb35e25283ea9517c 100644
--- a/openair2/LAYER2/nr_rlc/nr_rlc_ue_manager.h
+++ b/openair2/LAYER2/nr_rlc/nr_rlc_ue_manager.h
@@ -29,7 +29,7 @@ typedef void nr_rlc_ue_manager_t;
 typedef struct nr_rlc_ue_t {
   int rnti;
   nr_rlc_entity_t *srb[3];
-  nr_rlc_entity_t *drb[5];
+  nr_rlc_entity_t *drb[4];
 } nr_rlc_ue_t;
 
 /***********************************************************************/