diff --git a/openair2/RRC/NR/rrc_gNB.c b/openair2/RRC/NR/rrc_gNB.c
index 523195c4e5..dce25f45af 100755
--- a/openair2/RRC/NR/rrc_gNB.c
+++ b/openair2/RRC/NR/rrc_gNB.c
@@ -826,7 +826,9 @@ rrc_gNB_generate_dedicatedRRCReconfiguration(
     for(long drb_id_add = 1; drb_id_add <= nb_drb_to_setup; drb_id_add++){
       if(drb_id_add > MAX_DRBS_PER_PDUSESSION)
         break;
+      uint8_t drb_id = next_available_drb(ue_p, ue_context_pP->ue_context.pduSession[i].param.pdusession_id);
       NR_DRB_ToAddMod_t *DRB_config = generateDRB(ue_p,
+                                                  drb_id,
                                                   &ue_context_pP->ue_context.pduSession[i],
                                                   rrc->configuration.enable_sdap,
                                                   rrc->security.do_drb_integrity,
diff --git a/openair2/RRC/NR/rrc_gNB_drbs.c b/openair2/RRC/NR/rrc_gNB_drbs.c
index 642d83cc3b..7f94c487b1 100644
--- a/openair2/RRC/NR/rrc_gNB_drbs.c
+++ b/openair2/RRC/NR/rrc_gNB_drbs.c
@@ -22,11 +22,11 @@
 #include "rrc_gNB_drbs.h"
 
 NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue,
+                               uint8_t drb_id,
                                const pdu_session_param_t *pduSession,
                                bool enable_sdap,
                                int do_drb_integrity,
                                int do_drb_ciphering) {
-  uint8_t drb_id = next_available_drb(ue, pduSession->param.pdusession_id);
   NR_DRB_ToAddMod_t *DRB_config  = NULL;
   NR_SDAP_Config_t  *SDAP_config = NULL;
 
diff --git a/openair2/RRC/NR/rrc_gNB_drbs.h b/openair2/RRC/NR/rrc_gNB_drbs.h
index a8871d8bf0..ed3e2dd92f 100644
--- a/openair2/RRC/NR/rrc_gNB_drbs.h
+++ b/openair2/RRC/NR/rrc_gNB_drbs.h
@@ -32,6 +32,7 @@
 #define DRB_INACTIVE            (0)
 
 NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *rrc_ue,
+                               uint8_t drb_id,
                                const pdu_session_param_t *pduSession,
                                bool enable_sdap,
                                int do_drb_integrity,