diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 4e9261a453b..6165575b300 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -8241,7 +8241,7 @@ bool setup_tables(THD *thd, Name_resolution_context *context,
                                    0);
   SELECT_LEX *select_lex= select_insert ? thd->lex->first_select_lex() :
                                           thd->lex->current_select;
-  if (select_lex->first_cond_optimization || !select_lex->leaf_tables_saved)
+  if (select_lex->first_cond_optimization)
   {
     leaves.empty();
     if (select_lex->prep_leaf_list_state != SELECT_LEX::SAVED)
@@ -8305,6 +8305,7 @@ bool setup_tables(THD *thd, Name_resolution_context *context,
   }
   else
   { 
+    DBUG_ASSERT(select_lex->leaf_tables_saved);
     List_iterator_fast <TABLE_LIST> ti(select_lex->leaf_tables_exec);
     select_lex->leaf_tables.empty();
     while ((table_list= ti++))