diff --git a/av1/encoder/mcomp.c b/av1/encoder/mcomp.c
index c6e11a5c75b1e07cf0d355519fe7d0be56fdfb42..c77a43ccb131a962bb6e37fc7aad2940f5f592b5 100644
--- a/av1/encoder/mcomp.c
+++ b/av1/encoder/mcomp.c
@@ -2301,9 +2301,9 @@ int av1_full_pixel_search(const AV1_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bsize,
 
       // Should we allow a follow on exhaustive search?
       if (is_exhaustive_allowed(cpi, x)) {
-        int64_t exhuastive_thr = sf->exhaustive_searches_thresh;
+        int exhuastive_thr = sf->exhaustive_searches_thresh;
         exhuastive_thr >>=
-            8 - (b_width_log2_lookup[bsize] + b_height_log2_lookup[bsize]);
+            10 - (b_width_log2_lookup[bsize] + b_height_log2_lookup[bsize]);
 
         // Threshold variance for an exhaustive full search.
         if (var > exhuastive_thr) {
diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 0f9ea7506cf50c5ed09334b4fcfc624c3278b28e..3bf2df0f7de5a88fe955662d4ad79f1824ea5e6f 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -424,9 +424,9 @@ void av1_set_speed_features_framesize_independent(AV1_COMP *cpi) {
   sf->allow_exhaustive_searches = 1;
   int speed = (oxcf->speed > MAX_MESH_SPEED) ? MAX_MESH_SPEED : oxcf->speed;
   if (cpi->twopass.fr_content_type == FC_GRAPHICS_ANIMATION)
-    sf->exhaustive_searches_thresh = (1 << 22);
+    sf->exhaustive_searches_thresh = (1 << 24);
   else
-    sf->exhaustive_searches_thresh = (1 << 23);
+    sf->exhaustive_searches_thresh = (1 << 25);
   sf->max_exaustive_pct = good_quality_max_mesh_pct[speed];
   if (speed > 0)
     sf->exhaustive_searches_thresh = sf->exhaustive_searches_thresh << 1;