diff --git a/components/libc/pthreads/pthread.c b/components/libc/pthreads/pthread.c
index 8e79aceb2a2888ecb8bf4129f8f98e74dddc43d8..55f46c0caa23b0345bded0dc0e523fa2df8a0ad2 100644
--- a/components/libc/pthreads/pthread.c
+++ b/components/libc/pthreads/pthread.c
@@ -346,12 +346,6 @@ void pthread_exit(void *value)
         ptd->tls = RT_NULL;
     }
 
-    if (ptd->attr.detachstate == PTHREAD_CREATE_JOINABLE)
-    {
-        /* release the joinable pthread */
-        rt_sem_release(ptd->joinable_sem);
-    }
-
     /* detach thread */
     rt_thread_detach(ptd->tid);
     /* reschedule thread */
diff --git a/src/thread.c b/src/thread.c
index b23d2fb6b9b78fdffbbcda941816931743d9bbe6..0f2e1dc3d04ca173a2c1d91bd1a75425908786af 100644
--- a/src/thread.c
+++ b/src/thread.c
@@ -347,17 +347,17 @@ rt_err_t rt_thread_detach(rt_thread_t thread)
     /* change stat */
     thread->stat = RT_THREAD_CLOSE;
 
-    /* detach object */
-    rt_object_detach((rt_object_t)thread);
-
-    if (thread->cleanup != RT_NULL)
+    if ((rt_object_is_systemobject((rt_object_t)thread) == RT_TRUE) &&
+        thread->cleanup == RT_NULL)
+    {
+        rt_object_detach((rt_object_t)thread);
+    }
+    else
     {
         /* disable interrupt */
         lock = rt_hw_interrupt_disable();
-
         /* insert to defunct thread list */
         rt_list_insert_after(&rt_thread_defunct, &(thread->tlist));
-
         /* enable interrupt */
         rt_hw_interrupt_enable(lock);
     }
@@ -366,7 +366,6 @@ rt_err_t rt_thread_detach(rt_thread_t thread)
 }
 RTM_EXPORT(rt_thread_detach);
 
-
 #ifdef RT_USING_HEAP
 /**
  * This function will create a thread object and allocate thread object memory