diff --git a/av1/encoder/mcomp.c b/av1/encoder/mcomp.c
index 479b0aa..c1e2379 100644
--- a/av1/encoder/mcomp.c
+++ b/av1/encoder/mcomp.c
@@ -391,6 +391,9 @@
   if (mv_limits->col_max > col_max) mv_limits->col_max = col_max;
   if (mv_limits->row_min < row_min) mv_limits->row_min = row_min;
   if (mv_limits->row_max > row_max) mv_limits->row_max = row_max;
+
+  mv_limits->col_max = AOMMAX(mv_limits->col_min, mv_limits->col_max);
+  mv_limits->row_max = AOMMAX(mv_limits->row_min, mv_limits->row_max);
 }
 
 #if CONFIG_TIP
diff --git a/av1/encoder/mcomp.h b/av1/encoder/mcomp.h
index 635bfd9..e6571b2 100644
--- a/av1/encoder/mcomp.h
+++ b/av1/encoder/mcomp.h
@@ -580,10 +580,13 @@
   const int mv_low = av1_lower_mv_limit(MV_LOW + 1, sub_pel_prec_shift);
   const int mv_upp = av1_lower_mv_limit(MV_UPP - 1, sub_pel_prec_shift);
 
-  const int minc = AOMMAX(col_min, low_prec_ref_mv.col - max_mv);
-  const int maxc = AOMMIN(col_max, low_prec_ref_mv.col + max_mv);
-  const int minr = AOMMAX(row_min, low_prec_ref_mv.row - max_mv);
-  const int maxr = AOMMIN(row_max, low_prec_ref_mv.row + max_mv);
+  int minc = AOMMAX(col_min, low_prec_ref_mv.col - max_mv);
+  int maxc = AOMMIN(col_max, low_prec_ref_mv.col + max_mv);
+  int minr = AOMMAX(row_min, low_prec_ref_mv.row - max_mv);
+  int maxr = AOMMIN(row_max, low_prec_ref_mv.row + max_mv);
+
+  maxc = AOMMAX(minc, maxc);
+  maxr = AOMMAX(minr, maxr);
 
   subpel_limits->col_min = AOMMAX(mv_low + (1 << sub_pel_prec_shift), minc);
   subpel_limits->col_max = AOMMIN(mv_upp - (1 << sub_pel_prec_shift), maxc);
@@ -592,14 +595,14 @@
 #else
 
   const int max_mv = GET_MV_SUBPEL(MAX_FULL_PEL_VAL);
-  const int minc =
-      AOMMAX(GET_MV_SUBPEL(mv_limits->col_min), ref_mv->col - max_mv);
-  const int maxc =
-      AOMMIN(GET_MV_SUBPEL(mv_limits->col_max), ref_mv->col + max_mv);
-  const int minr =
-      AOMMAX(GET_MV_SUBPEL(mv_limits->row_min), ref_mv->row - max_mv);
-  const int maxr =
-      AOMMIN(GET_MV_SUBPEL(mv_limits->row_max), ref_mv->row + max_mv);
+  int minc = AOMMAX(GET_MV_SUBPEL(mv_limits->col_min), ref_mv->col - max_mv);
+  int maxc = AOMMIN(GET_MV_SUBPEL(mv_limits->col_max), ref_mv->col + max_mv);
+  int minr = AOMMAX(GET_MV_SUBPEL(mv_limits->row_min), ref_mv->row - max_mv);
+  int maxr = AOMMIN(GET_MV_SUBPEL(mv_limits->row_max), ref_mv->row + max_mv);
+
+  maxc = AOMMAX(minc, maxc);
+  maxr = AOMMAX(minr, maxr);
+
   subpel_limits->col_min = AOMMAX(MV_LOW + 1, minc);
   subpel_limits->col_max = AOMMIN(MV_UPP - 1, maxc);
   subpel_limits->row_min = AOMMAX(MV_LOW + 1, minr);