diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc
index efb4337..e8c9dbd 100644
--- a/sql/sql_connect.cc
+++ b/sql/sql_connect.cc
@@ -1190,7 +1190,6 @@ bool login_connection(THD *thd)
 void end_connection(THD *thd)
 {
   NET *net= &thd->net;
-  plugin_thdvar_cleanup(thd);
 
   if (thd->user_connect)
   {
@@ -1401,6 +1400,7 @@ void do_handle_one_connection(THD *thd_arg)
    
 end_thread:
     close_connection(thd);
+    plugin_thdvar_cleanup(thd);
 
     if (thd->userstat_running)
       update_global_user_stats(thd, create_user, time(NULL));