diff --git a/mysql-test/main/log_slow.result b/mysql-test/main/log_slow.result
index 74a77e3f11d..a7172af59d5 100644
--- a/mysql-test/main/log_slow.result
+++ b/mysql-test/main/log_slow.result
@@ -95,7 +95,7 @@ INFORMATION_SCHEMA.GLOBAL_STATUS
 WHERE
 VARIABLE_NAME='SLOW_QUERIES';
 Slow_queries_increment
-0
+1
 # Although this query is disallowed by log_slow_filter, it should still increment Slow_queries
 SET log_slow_filter=filesort;
 SELECT sleep(0.2) INTO @tmp FROM DUAL;
@@ -110,7 +110,7 @@ INFORMATION_SCHEMA.GLOBAL_STATUS
 WHERE
 VARIABLE_NAME='SLOW_QUERIES';
 Slow_queries_increment
-0
+1
 SET log_slow_filter=DEFAULT;
 SET @@long_query_time=default;
 SET GLOBAL slow_query_log= @org_slow_query_log;
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 02dec7e9499..69e6f58f854 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -4839,8 +4839,6 @@ public:
 
   inline void prepare_logs_for_admin_command()
   {
-    enable_slow_log&= !MY_TEST(variables.log_slow_disabled_statements &
-                               LOG_SLOW_DISABLE_ADMIN);
     query_plan_flags|= QPLAN_ADMIN;
   }
 };
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 003027655fb..8eeb0fa3415 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -7702,7 +7702,7 @@ void THD::reset_for_next_command(bool do_clear_error)
   if (opt_bin_log)
     reset_dynamic(&user_var_events);
   DBUG_ASSERT(user_var_events_alloc == &main_mem_root);
-  enable_slow_log= variables.sql_log_slow;
+  enable_slow_log= true;
   get_stmt_da()->reset_for_next_command();
   rand_used= 0;
   m_sent_row_count= m_examined_row_count= 0;