diff --git a/openair3/NGAP/ngap_gNB_nnsf.c b/openair3/NGAP/ngap_gNB_nnsf.c
index 5fbc3e4d11..e16e790d38 100644
--- a/openair3/NGAP/ngap_gNB_nnsf.c
+++ b/openair3/NGAP/ngap_gNB_nnsf.c
@@ -156,7 +156,7 @@ ngap_gNB_amf_data_t *ngap_gNB_nnsf_select_amf_by_plmn_id(ngap_gNB_instance_t *in
 ngap_gNB_amf_data_t *ngap_gNB_nnsf_select_amf_by_amf_setid(ngap_gNB_instance_t *instance_p,
                                                            const ngap_rrc_establishment_cause_t cause,
                                                            const plmn_id_t selected_plmn_identity,
-                                                           uint8_t amf_setid)
+                                                           uint16_t amf_setid)
 {
   struct ngap_gNB_amf_data_s *amf_data_p = NULL;
 
diff --git a/openair3/NGAP/ngap_gNB_nnsf.h b/openair3/NGAP/ngap_gNB_nnsf.h
index 8a87ecfce2..0b7c7059e3 100644
--- a/openair3/NGAP/ngap_gNB_nnsf.h
+++ b/openair3/NGAP/ngap_gNB_nnsf.h
@@ -43,7 +43,7 @@ ngap_gNB_amf_data_t *ngap_gNB_nnsf_select_amf_by_plmn_id(ngap_gNB_instance_t *in
 ngap_gNB_amf_data_t *ngap_gNB_nnsf_select_amf_by_amf_setid(ngap_gNB_instance_t *instance_p,
                                                            const ngap_rrc_establishment_cause_t cause,
                                                            const plmn_id_t selected_plmn_identity,
-                                                           uint8_t amf_setid);
+                                                           uint16_t amf_setid);
 
 ngap_gNB_amf_data_t *ngap_gNB_nnsf_select_amf_by_guami(ngap_gNB_instance_t *instance_p,
                                                        const ngap_rrc_establishment_cause_t cause,