diff --git a/src/mme/emm-sm.c b/src/mme/emm-sm.c
index 4881297ec..c961aa6ac 100644
--- a/src/mme/emm-sm.c
+++ b/src/mme/emm-sm.c
@@ -545,7 +545,7 @@ static void common_register_state(ogs_fsm_t *s, mme_event_t *e)
 
             rv = s1ap_send_ue_context_release_command(enb_ue,
                     S1AP_Cause_PR_nas, S1AP_CauseNas_detach,
-                    S1AP_UE_CTX_REL_S1_REMOVE_AND_UNLINK, 0);
+                    S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0);
             ogs_expect(rv == OGS_OK);
 
             OGS_FSM_TRAN(s, &emm_state_de_registered);
diff --git a/src/mme/mme-s11-handler.c b/src/mme/mme-s11-handler.c
index db80c976f..e3a06a569 100644
--- a/src/mme/mme-s11-handler.c
+++ b/src/mme/mme-s11-handler.c
@@ -573,8 +573,7 @@ void mme_s11_handle_delete_session_response(
 
     } else if (action == OGS_GTP_DELETE_SEND_DETACH_ACCEPT) {
         if (mme_sess_count(mme_ue) == 1) /* Last Session */ {
-            ogs_assert(OGS_OK ==
-                nas_eps_send_detach_accept(mme_ue));
+            ogs_assert(OGS_OK == nas_eps_send_detach_accept(mme_ue));
         }
 
     } else if (action ==
diff --git a/src/mme/nas-path.c b/src/mme/nas-path.c
index 0b5128c33..f50ecc720 100644
--- a/src/mme/nas-path.c
+++ b/src/mme/nas-path.c
@@ -315,7 +315,7 @@ int nas_eps_send_detach_accept(mme_ue_t *mme_ue)
 
     rv = s1ap_send_ue_context_release_command(enb_ue,
             S1AP_Cause_PR_nas, S1AP_CauseNas_detach,
-            S1AP_UE_CTX_REL_S1_REMOVE_AND_UNLINK, 0);
+            S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0);
     ogs_expect(rv == OGS_OK);
 
     return rv;