diff --git a/av1/encoder/nonrd_pickmode.c b/av1/encoder/nonrd_pickmode.c
index f188f0e..29cc7aa 100644
--- a/av1/encoder/nonrd_pickmode.c
+++ b/av1/encoder/nonrd_pickmode.c
@@ -2955,7 +2955,10 @@
     if (!use_ref_frame_mask[ref_frame]) continue;
 
     if (x->force_zeromv_skip &&
-        (this_mode != GLOBALMV || ref_frame != LAST_FRAME))
+        ((!(this_mode == NEARESTMV &&
+            frame_mv[this_mode][ref_frame].as_int == 0) &&
+          this_mode != GLOBALMV) ||
+         ref_frame != LAST_FRAME))
       continue;
 
     force_mv_inter_layer = 0;