diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 1e53785749f..462cbbce4cb 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -1907,7 +1907,7 @@ JOIN::exec()
 			    send_row_on_empty_set(),
 			    select_options,
 			    zero_result_cause,
-			    having);
+			    having ? having : tmp_having);
     DBUG_VOID_RETURN;
   }