diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index de2e1c7622e..a1a8a862a8e 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1814,7 +1814,7 @@ static void close_connections(void)
 
   /* Kill phase 2 */
   server_threads.iterate(kill_thread_phase_2);
-  for (uint64 i= 0; THD_count::connection_thd_count(); i++)
+  for (uint64 i= 0; THD_count::value() > local_connection_thread_count; i++)
   {
     /*
       This time the warnings are emitted within the loop to provide a