diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index a86981a71..8e58a7fa8 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -588,6 +588,7 @@ static void choose_partitioning(VP9_COMP *cpi,
       bsize = BLOCK_32X32;
 
     y_sad = vp9_int_pro_motion_estimation(cpi, x, bsize);
+    x->pred_mv[LAST_FRAME] = mbmi->mv[0].as_mv;
 #endif
 
     vp9_build_inter_predictors_sb(xd, mi_row, mi_col, BLOCK_64X64);
diff --git a/vp9/encoder/vp9_mcomp.c b/vp9/encoder/vp9_mcomp.c
index c49a8bef3..0730467b0 100644
--- a/vp9/encoder/vp9_mcomp.c
+++ b/vp9/encoder/vp9_mcomp.c
@@ -1855,7 +1855,6 @@ unsigned int vp9_int_pro_motion_estimation(const VP9_COMP *cpi, MACROBLOCK *x,
   }
   tmp_mv->row *= 8;
   tmp_mv->col *= 8;
-  x->pred_mv[LAST_FRAME] = *tmp_mv;
 
   return best_sad;
 }