diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 5ba2722482b..0b6d63c1446 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -541,6 +541,9 @@ JOIN::optimize()
     DBUG_RETURN(0);
   optimized= 1;
 
+  if (thd->lex->orig_sql_command != SQLCOM_SHOW_STATUS)
+    thd->status_var.last_query_cost= 0.0;
+
   row_limit= ((select_distinct || order || group_list) ? HA_POS_ERROR :
 	      unit->select_limit_cnt);
   /* select_limit is used to decide if we are likely to scan the whole table */