diff --git a/openair2/RRC/NR/rrc_gNB.c b/openair2/RRC/NR/rrc_gNB.c
index 9fa42e0a5f..65c391c67a 100755
--- a/openair2/RRC/NR/rrc_gNB.c
+++ b/openair2/RRC/NR/rrc_gNB.c
@@ -826,7 +826,7 @@ 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);
+      uint8_t drb_id = next_available_drb(ue_p, ue_context_pP->ue_context.pduSession[i].param.pdusession_id, NONGBR_FLOW);
 
       // Reference TS23501 Table 5.7.4-1: Standardized 5QI to QoS characteristics mapping
       for (qos_flow_index = 0; qos_flow_index < ue_context_pP->ue_context.pduSession[i].param.nb_qos; qos_flow_index++) {
diff --git a/openair2/RRC/NR/rrc_gNB_drbs.c b/openair2/RRC/NR/rrc_gNB_drbs.c
index b272dc2be8..080c73c2fa 100644
--- a/openair2/RRC/NR/rrc_gNB_drbs.c
+++ b/openair2/RRC/NR/rrc_gNB_drbs.c
@@ -105,7 +105,7 @@ NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue,
   return DRB_config;
 }
 
-uint8_t next_available_drb(gNB_RRC_UE_t *ue, uint8_t pdusession_id) {
+uint8_t next_available_drb(gNB_RRC_UE_t *ue, uint8_t pdusession_id, bool is_gbr) {
   uint8_t drb_id;
   for (drb_id = 0; drb_id < NGAP_MAX_DRBS_PER_UE; drb_id++) {
     if(ue->DRB_active[drb_id] == DRB_INACTIVE)
diff --git a/openair2/RRC/NR/rrc_gNB_drbs.h b/openair2/RRC/NR/rrc_gNB_drbs.h
index 07a659bae3..8383aa7540 100644
--- a/openair2/RRC/NR/rrc_gNB_drbs.h
+++ b/openair2/RRC/NR/rrc_gNB_drbs.h
@@ -30,6 +30,8 @@
 #define MAX_PDUS_PER_UE         (8)   /* Maximum number of PDU Sessions per UE */
 #define DRB_ACTIVE              (1)
 #define DRB_INACTIVE            (0)
+#define GBR_FLOW                (1)
+#define NONGBR_FLOW             (0)
 
 NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *rrc_ue,
                                uint8_t drb_id,
@@ -38,7 +40,7 @@ NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *rrc_ue,
                                int do_drb_integrity,
                                int do_drb_ciphering);
 
-uint8_t next_available_drb(gNB_RRC_UE_t *ue, uint8_t pdusession_id);
+uint8_t next_available_drb(gNB_RRC_UE_t *ue, uint8_t pdusession_id, bool is_gbr);
 bool drb_is_active(gNB_RRC_UE_t *ue, uint8_t drb_id);
 
 #endif
\ No newline at end of file