diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 2952184..347579c 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -5307,7 +5307,10 @@
   x->using_dist_8x8 = cpi->oxcf.using_dist_8x8;
   x->tune_metric = cpi->oxcf.tuning;
 #endif
-  cm->setup_mi(cm);
+
+  if (!cpi->sf.use_nonrd_pick_mode) {
+    cm->setup_mi(cm);
+  }
 
   xd->mi = cm->mi_grid_visible;
   xd->mi[0] = cm->mi;