diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index a4f981be1..562d9ead9 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -625,6 +625,20 @@ static void mode_info_conversion(VP9_COMP *cpi, const TileInfo *const tile,
     }
 
     mbmi->mode = mi->bmi[3].as_mode;
+  } else {
+    switch (mbmi->mode) {
+      case NEARESTMV:
+        mbmi->mv[0].as_int = nearest_mv.as_int;
+        break;
+      case NEARMV:
+        mbmi->mv[0].as_int = near_mv.as_int;
+        break;
+      case ZEROMV:
+        mbmi->mv[0].as_int = 0;
+        break;
+      default:
+        break;
+    }
   }
 }
 #endif