diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index cbd3339..0b570d6 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -2302,7 +2302,7 @@
       continue;
     }
     if (prune_modes_based_on_tpl && !ref_match_found_in_above_nb &&
-        !ref_match_found_in_left_nb) {
+        !ref_match_found_in_left_nb && (ref_best_rd != INT64_MAX)) {
       if (prune_modes_based_on_tpl_stats(inter_cost_info_from_tpl, refs,
                                          ref_mv_idx, this_mode))
         continue;
diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 5117f52..11e2d61 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -575,6 +575,7 @@
     sf->part_sf.ext_partition_eval_thresh =
         cm->allow_screen_content_tools ? BLOCK_8X8 : BLOCK_16X16;
 
+    sf->inter_sf.prune_inter_modes_based_on_tpl = boosted ? 0 : 1;
     sf->inter_sf.disable_interinter_wedge = 1;
     sf->inter_sf.disable_obmc = 1;
     sf->inter_sf.disable_onesided_comp = 1;