diff --git a/mysql-test/r/win.result b/mysql-test/r/win.result
index 7f8777e..aa7d68c 100644
--- a/mysql-test/r/win.result
+++ b/mysql-test/r/win.result
@@ -2762,10 +2762,8 @@ CREATE TABLE t1 (i INT);
 INSERT INTO t1 VALUES (3), (1), (2);
 SELECT i, ROW_NUMBER() OVER () FROM t1 WHERE 1 = 2;
 i      ROW_NUMBER() OVER ()
-NULL   1
 SELECT i, COUNT(*) OVER () FROM t1 WHERE 1 = 2;
 i      COUNT(*) OVER ()
-NULL   1
 DROP TABLE t1;
 #
 # MDEV-12051: window function in query with implicit grouping
diff --git a/mysql-test/r/win_insert_select.result b/mysql-test/r/win_insert_select.result
index c86576d..93545e6 100644
--- a/mysql-test/r/win_insert_select.result
+++ b/mysql-test/r/win_insert_select.result
@@ -11,10 +11,6 @@ c1   c2
 4      manual_insert_2
 11     should repeat 4 times [11-14]
 12     should repeat 4 times [11-14]
-13     should repeat 4 times [11-14]
-14     should repeat 4 times [11-14]
-0      should_have_0
-2      should_have_2
 DELETE FROM t1;
 EXECUTE populate_table;
 INSERT INTO t1
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index e8e3998..e5805c4 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -3398,7 +3398,7 @@ void JOIN::exec_inner()

   if (zero_result_cause)
   {
-    if (select_lex->have_window_funcs())
+    if (select_lex->have_window_funcs() && send_row_on_empty_set())
     {
       const_tables= table_count;
       first_select= sub_select_postjoin_aggr;