diff --git a/mysql-test/r/analyze_stmt.result b/mysql-test/r/analyze_stmt.result
index 628c7859e6c..0a42728c81c 100644
--- a/mysql-test/r/analyze_stmt.result
+++ b/mysql-test/r/analyze_stmt.result
@@ -293,3 +293,13 @@ analyze select * into outfile '../../tmp/data1.tmp' from t1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	r_rows	filtered	r_filtered	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	4	100.00	100.00	
 drop table t1;
+#
+# MDEV-7024: Assertion `! is_set()' failed in 
+# Diagnostics_area::set_eof_status on executing ANALYZE SELECT via PS
+#
+create table t1(a int);
+prepare stmt from "analyze select * from t1";
+execute stmt;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	r_rows	filtered	r_filtered	Extra
+1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	no matching row in const table
+drop table t1;
diff --git a/mysql-test/t/analyze_stmt.test b/mysql-test/t/analyze_stmt.test
index f5c5c432434..4da16cf6474 100644
--- a/mysql-test/t/analyze_stmt.test
+++ b/mysql-test/t/analyze_stmt.test
@@ -233,3 +233,14 @@ analyze select * into outfile '../../tmp/data1.tmp' from t1;
 --remove_file $MYSQLTEST_VARDIR/tmp/data1.tmp
 
 drop table t1;
+
+
+--echo #
+--echo # MDEV-7024: Assertion `! is_set()' failed in 
+--echo # Diagnostics_area::set_eof_status on executing ANALYZE SELECT via PS
+--echo #
+
+create table t1(a int);
+prepare stmt from "analyze select * from t1";
+execute stmt;
+drop table t1;
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 3b2b3d841a8..11638ad30d5 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -4108,7 +4108,7 @@ public:
   virtual bool check_simple_select() const { return FALSE; }
   void abort_result_set();
   virtual void cleanup();
-  bool is_result_interceptor() { return true; }
+  bool is_result_interceptor() { return false; }
 };