diff --git a/openair2/RRC/NR/rrc_gNB.c b/openair2/RRC/NR/rrc_gNB.c
index 893d90ac06..d768a3ac7a 100644
--- a/openair2/RRC/NR/rrc_gNB.c
+++ b/openair2/RRC/NR/rrc_gNB.c
@@ -2598,10 +2598,14 @@ void prepare_and_send_ue_context_modification_f1(rrc_gNB_ue_context_t *ue_contex
   }
 
   /* Instruction towards the DU for SRB2 configuration */
-  int nb_srb = 1;
-  f1ap_srb_to_be_setup_t srbs[nb_srb];
-  srbs[0].srb_id = 2;
-  srbs[0].lcid = 2;
+  int nb_srb = 0;
+  f1ap_srb_to_be_setup_t srbs[1];
+  if (UE->Srb[2].Active == 0) {
+    UE->Srb[2].Active = 1;
+    nb_srb = 1;
+    srbs[0].srb_id = 2;
+    srbs[0].lcid = 2;
+  }
 
   f1ap_ue_context_modif_req_t ue_context_modif_req = {
     .gNB_CU_ue_id = 0xffffffff, /* filled by F1 for the moment */