diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index d1a0c7f14ea..274fedc7541 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -2092,7 +2092,7 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables, bool if_exists,
       const char *comment_start;
       uint32 comment_len;
 
-      built_query.set_charset(system_charset_info);
+      built_query.set_charset(thd->charset());
       if (if_exists)
         built_query.append("DROP TABLE IF EXISTS ");
       else