diff --git a/openair2/RRC/NR/rrc_gNB.c b/openair2/RRC/NR/rrc_gNB.c
index bcc29eaa9c..8f0a95dc72 100755
--- a/openair2/RRC/NR/rrc_gNB.c
+++ b/openair2/RRC/NR/rrc_gNB.c
@@ -826,7 +826,8 @@ 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;
-      NR_DRB_ToAddMod_t *DRB_config = generateDRB(ctxt_pP->rnti,
+      NR_DRB_ToAddMod_t *DRB_config = generateDRB(ue_p,
+                                                  ctxt_pP->rnti,
                                                   &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 488c512569..b686f5e280 100644
--- a/openair2/RRC/NR/rrc_gNB_drbs.c
+++ b/openair2/RRC/NR/rrc_gNB_drbs.c
@@ -27,7 +27,8 @@ typedef struct {
 
 static nr_ue_list_t ues;
 
-NR_DRB_ToAddMod_t *generateDRB(rnti_t rnti,
+NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue,
+                               rnti_t rnti,
                                const pdu_session_param_t *pduSession,
                                bool enable_sdap,
                                int do_drb_integrity,
diff --git a/openair2/RRC/NR/rrc_gNB_drbs.h b/openair2/RRC/NR/rrc_gNB_drbs.h
index 79af30cfcd..8974a5ab2f 100644
--- a/openair2/RRC/NR/rrc_gNB_drbs.h
+++ b/openair2/RRC/NR/rrc_gNB_drbs.h
@@ -43,7 +43,8 @@ typedef struct nr_ue_s {
   struct nr_ue_s *next_ue;
 } nr_ue_t;
 
-NR_DRB_ToAddMod_t *generateDRB(rnti_t rnti,
+NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue,
+                               rnti_t rnti,
                                const pdu_session_param_t *pduSession,
                                bool enable_sdap,
                                int do_drb_integrity,