diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 087c7903dc7..acd4873b212 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -6717,7 +6717,7 @@ void sql_kill(THD *thd, ulong id, killed_state state)
   uint error;
   if (!(error= kill_one_thread(thd, id, state)))
   {
-    if ((!thd->killed) || (thd->thread_id == id))
+    if ((!thd->killed) || (thd->thread_id == id && thd->killed >= KILL_CONNECTION))
       my_ok(thd);
   }
   else