diff --git a/src/mme/emm-sm.c b/src/mme/emm-sm.c
index 63e82fdb97..55812c2042 100644
--- a/src/mme/emm-sm.c
+++ b/src/mme/emm-sm.c
@@ -674,8 +674,11 @@ static void common_register_state(ogs_fsm_t *s, mme_event_t *e,
                 ogs_fatal("Invalid Procedure Code[%d]", (int)e->s1ap_code);
             }
 
-            if (!mme_ue->nas_eps.update.active_flag)
+            if (!mme_ue->nas_eps.update.active_flag) {
+                enb_ue->relcause.group = S1AP_Cause_PR_nas;
+                enb_ue->relcause.cause = S1AP_CauseNas_normal_release;
                 mme_send_release_access_bearer_or_ue_context_release(enb_ue);
+            }
 
             if (mme_ue->next.m_tmsi) {
                 ogs_fatal("MME does not create new GUTI");
@@ -743,6 +746,8 @@ static void common_register_state(ogs_fsm_t *s, mme_event_t *e,
                         OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK);
                     ogs_expect(r == OGS_OK);
                     ogs_assert(r != OGS_ERROR);
+                    enb_ue->relcause.group = S1AP_Cause_PR_nas;
+                    enb_ue->relcause.cause = S1AP_CauseNas_normal_release;
                     mme_send_release_access_bearer_or_ue_context_release(
                             enb_ue);
                     break;
diff --git a/src/mme/mme-context.h b/src/mme/mme-context.h
index 5736d8e15e..4c59551247 100644
--- a/src/mme/mme-context.h
+++ b/src/mme/mme-context.h
@@ -287,6 +287,12 @@ struct enb_ue_s {
     /* S1 Holding timer for removing this context */
     ogs_timer_t     *t_s1_holding;
 
+    /* UEContextReleaseRequest or InitialContextSetupFailure */
+    struct {
+        S1AP_Cause_PR group;
+        long cause;
+    } relcause;
+
     /* Store by UE Context Release Command
      * Retrieve by UE Context Release Complete */
 #define S1AP_UE_CTX_REL_INVALID_ACTION                      0
diff --git a/src/mme/mme-path.c b/src/mme/mme-path.c
index 3a824d6f21..8dd1609b06 100644
--- a/src/mme/mme-path.c
+++ b/src/mme/mme-path.c
@@ -156,7 +156,7 @@ void mme_send_release_access_bearer_or_ue_context_release(enb_ue_t *enb_ue)
     } else {
         ogs_debug("No UE Context");
         r = s1ap_send_ue_context_release_command(enb_ue,
-                S1AP_Cause_PR_nas, S1AP_CauseNas_normal_release,
+                enb_ue->relcause.group, enb_ue->relcause.cause,
                 S1AP_UE_CTX_REL_S1_CONTEXT_REMOVE, 0);
         ogs_expect(r == OGS_OK);
         ogs_assert(r != OGS_ERROR);
diff --git a/src/mme/mme-s11-handler.c b/src/mme/mme-s11-handler.c
index a6cebe1a9a..265a6faa5a 100644
--- a/src/mme/mme-s11-handler.c
+++ b/src/mme/mme-s11-handler.c
@@ -1435,7 +1435,7 @@ void mme_s11_handle_release_access_bearers_response(
         enb_ue = enb_ue_find_by_id(mme_ue->enb_ue_id);
         if (enb_ue) {
             r = s1ap_send_ue_context_release_command(enb_ue,
-                    S1AP_Cause_PR_nas, S1AP_CauseNas_normal_release,
+                    enb_ue->relcause.group, enb_ue->relcause.cause,
                     S1AP_UE_CTX_REL_S1_REMOVE_AND_UNLINK, 0);
             ogs_expect(r == OGS_OK);
             ogs_assert(r != OGS_ERROR);
diff --git a/src/mme/s1ap-handler.c b/src/mme/s1ap-handler.c
index d6c37554c6..e8063ecf89 100644
--- a/src/mme/s1ap-handler.c
+++ b/src/mme/s1ap-handler.c
@@ -1195,6 +1195,9 @@ void s1ap_handle_initial_context_setup_failure(
         CLEAR_MME_UE_ALL_TIMERS(mme_ue);
     }
 
+    enb_ue->relcause.group = S1AP_Cause_PR_nas;
+    enb_ue->relcause.cause = S1AP_CauseNas_normal_release;
+
     /*
      * 19.2.2.3 in Spec 36.300
      *
@@ -1759,6 +1762,8 @@ void s1ap_handle_ue_context_release_request(
         break;
     }
 
+    enb_ue->relcause.group = Cause->present;
+    enb_ue->relcause.cause = (int)Cause->choice.radioNetwork;
     mme_send_release_access_bearer_or_ue_context_release(enb_ue);
 }