diff --git a/openair2/F1AP/f1ap_cu_ue_context_management.c b/openair2/F1AP/f1ap_cu_ue_context_management.c
index d4ebafa2a8..096cd21bac 100644
--- a/openair2/F1AP/f1ap_cu_ue_context_management.c
+++ b/openair2/F1AP/f1ap_cu_ue_context_management.c
@@ -673,7 +673,7 @@ int CU_handle_UE_CONTEXT_SETUP_RESPONSE(instance_t       instance,
 
   // DRBs_Setup_List 
   F1AP_FIND_PROTOCOLIE_BY_ID(F1AP_UEContextSetupResponseIEs_t, ie, container,
-                             F1AP_ProtocolIE_ID_id_DRBs_Setup_List, true);
+                             F1AP_ProtocolIE_ID_id_DRBs_Setup_List, false);
   if(ie!=NULL){
     f1ap_ue_context_setup_resp->drbs_to_be_setup_length = ie->value.choice.DRBs_Setup_List.list.count;
     f1ap_ue_context_setup_resp->drbs_to_be_setup = calloc(f1ap_ue_context_setup_resp->drbs_to_be_setup_length,
@@ -739,7 +739,7 @@ int CU_handle_UE_CONTEXT_SETUP_RESPONSE(instance_t       instance,
 
   // SRBs_Setup_List 
   F1AP_FIND_PROTOCOLIE_BY_ID(F1AP_UEContextSetupResponseIEs_t, ie, container,
-      F1AP_ProtocolIE_ID_id_SRBs_Setup_List, true);
+      F1AP_ProtocolIE_ID_id_SRBs_Setup_List, false);
   if(ie!=NULL){
     f1ap_ue_context_setup_resp->srbs_to_be_setup_length = ie->value.choice.SRBs_Setup_List.list.count;
     f1ap_ue_context_setup_resp->srbs_to_be_setup = calloc(f1ap_ue_context_setup_resp->srbs_to_be_setup_length,
diff --git a/openair2/F1AP/f1ap_du_ue_context_management.c b/openair2/F1AP/f1ap_du_ue_context_management.c
index 5580741a63..35251ec248 100644
--- a/openair2/F1AP/f1ap_du_ue_context_management.c
+++ b/openair2/F1AP/f1ap_du_ue_context_management.c
@@ -134,7 +134,7 @@ int DU_handle_UE_CONTEXT_SETUP_REQUEST(instance_t       instance,
   /* DRB */
   F1AP_UEContextSetupRequestIEs_t *ieDrb;
   F1AP_FIND_PROTOCOLIE_BY_ID(F1AP_UEContextSetupRequestIEs_t, ieDrb, container,
-			     F1AP_ProtocolIE_ID_id_DRBs_ToBeSetup_List, true);
+			     F1AP_ProtocolIE_ID_id_DRBs_ToBeSetup_List, false);
   
   if(ieDrb!=NULL) {
     f1ap_ue_context_setup_req->drbs_to_be_setup_length = ieDrb->value.choice.DRBs_ToBeSetup_List.list.count;
@@ -187,7 +187,7 @@ int DU_handle_UE_CONTEXT_SETUP_REQUEST(instance_t       instance,
   /* SRB */
   F1AP_UEContextSetupRequestIEs_t *ieSrb;
   F1AP_FIND_PROTOCOLIE_BY_ID(F1AP_UEContextSetupRequestIEs_t, ieSrb, container,
-			     F1AP_ProtocolIE_ID_id_SRBs_ToBeSetup_List, true);
+			     F1AP_ProtocolIE_ID_id_SRBs_ToBeSetup_List, false);
   
   if(ieSrb != NULL) {
     f1ap_ue_context_setup_req->srbs_to_be_setup_length = ieSrb->value.choice.SRBs_ToBeSetup_List.list.count;