diff --git a/openair3/NGAP/ngap_gNB_decoder.c b/openair3/NGAP/ngap_gNB_decoder.c
index 481cccf876..43110e9037 100644
--- a/openair3/NGAP/ngap_gNB_decoder.c
+++ b/openair3/NGAP/ngap_gNB_decoder.c
@@ -76,6 +76,12 @@ static int ngap_gNB_decode_initiating_message(NGAP_NGAP_PDU_t *pdu) {
       NGAP_INFO("Handover Preparation initiating message\n");
       break;
 
+    case NGAP_ProcedureCode_id_HandoverCancel:
+      res = asn_encode_to_new_buffer(NULL, ATS_CANONICAL_XER, &asn_DEF_NGAP_NGAP_PDU, pdu);
+      free(res.buffer);
+      NGAP_INFO("Handover Cancel initiating message\n");
+      break;
+
     case NGAP_ProcedureCode_id_PDUSessionResourceModify:
       res = asn_encode_to_new_buffer(NULL, ATS_CANONICAL_XER, &asn_DEF_NGAP_NGAP_PDU, pdu);
       free(res.buffer);
diff --git a/openair3/NGAP/ngap_gNB_encoder.c b/openair3/NGAP/ngap_gNB_encoder.c
index be3945c2f0..ff318ed184 100644
--- a/openair3/NGAP/ngap_gNB_encoder.c
+++ b/openair3/NGAP/ngap_gNB_encoder.c
@@ -55,6 +55,7 @@ static inline int ngap_gNB_encode_initiating(NGAP_NGAP_PDU_t *pdu, uint8_t **buf
                                       NGAP_ProcedureCode_id_PDUSessionResourceModifyIndication,
                                       NGAP_ProcedureCode_id_UplinkRANStatusTransfer,
                                       NGAP_ProcedureCode_id_HandoverPreparation,
+                                      NGAP_ProcedureCode_id_HandoverCancel,
                                       NGAP_ProcedureCode_id_HandoverNotification};
   int i;
   for (i = 0; i < sizeofArray(tmp); i++)