diff --git a/src/ipc.c b/src/ipc.c
index 3c6e82949b1..a1a9c1f2daf 100644
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -945,28 +945,30 @@ static rt_bool_t _check_and_update_prio(rt_thread_t thread, rt_mutex_t mutex)
 static void _mutex_before_delete_detach(rt_mutex_t mutex)
 {
     rt_sched_lock_level_t slvl;
-    rt_bool_t need_schedule;
+    rt_bool_t need_schedule = RT_FALSE;
 
     rt_spin_lock(&(mutex->spinlock));
     /* wakeup all suspended threads */
     rt_susp_list_resume_all(&(mutex->parent.suspend_thread), RT_ERROR);
+
+    rt_sched_lock(&slvl);
+
     /* remove mutex from thread's taken list */
     rt_list_remove(&mutex->taken_list);
 
     /* whether change the thread priority */
     if (mutex->owner)
     {
-        rt_sched_lock(&slvl);
         need_schedule = _check_and_update_prio(mutex->owner, mutex);
+    }
 
-        if (need_schedule)
-        {
-            rt_sched_unlock_n_resched(slvl);
-        }
-        else
-        {
-            rt_sched_unlock(slvl);
-        }
+    if (need_schedule)
+    {
+        rt_sched_unlock_n_resched(slvl);
+    }
+    else
+    {
+        rt_sched_unlock(slvl);
     }
 
     /* unlock and do necessary reschedule if required */
@@ -1617,11 +1619,11 @@ rt_err_t rt_mutex_release(rt_mutex_t mutex)
     /* if no hold */
     if (mutex->hold == 0)
     {
+        rt_sched_lock(&slvl);
+
         /* remove mutex from thread's taken list */
         rt_list_remove(&mutex->taken_list);
 
-        rt_sched_lock(&slvl);
-
         /* whether change the thread priority */
         need_schedule = _check_and_update_prio(thread, mutex);