The subject technology receives a first query plan corresponding to a first query, the first query plan comprising a new query plan different than a previous query plan for the first query. The subject technology determines a value indicating an estimated improvement in execution time of the first query plan in comparison to a previous execution time of the previous query plan. The subject technology, in response to determining that the value is greater than a threshold value, attempting to execute the first query using the first query plan, the attempting comprising determining that a second query plan selected among a plurality of query plans has a second estimated execution time that is less than an estimated execution time of the first query plan, and executing the first query at a subsequent time using the second query plan.