diff --git a/kernel/system/do_kill.c b/kernel/system/do_kill.c
index 289bcc099..e102bed2f 100644
--- a/kernel/system/do_kill.c
+++ b/kernel/system/do_kill.c
@@ -41,8 +41,11 @@ message *m_ptr;			/* pointer to request message */
 
   /* Set pending signal to be processed by the PM. */
   cause_sig(proc_nr, sig_nr);
-  if (sig_nr == SIGKILL)
+  if (sig_nr == SIGKILL) {
 	clear_endpoint(proc_addr(proc_nr));
+	if(m_ptr->SIG_ENDPT == SELF)
+		return EDONTREPLY;
+  }
   return(OK);
 }