diff --git a/av1/common/reconinter.c b/av1/common/reconinter.c
index eee3458..af6cb1c 100644
--- a/av1/common/reconinter.c
+++ b/av1/common/reconinter.c
@@ -1762,8 +1762,8 @@
     case BLOCK_8X4:
     case BLOCK_4X8: return 1; break;
 #else
-    case BLOCK_4X4: return dir == 1; break;
-    case BLOCK_8X4: return dir == 0; break;
+    case BLOCK_4X4:
+    case BLOCK_8X4:
     case BLOCK_4X8: return dir == 1; break;
 #endif
     default: return 0;
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index f94f1f4..b42558a 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -9830,7 +9830,8 @@
 
 #if CONFIG_MOTION_VAR
   av1_count_overlappable_neighbors(cm, xd, mi_row, mi_col);
-  if (check_num_overlappable_neighbors(mbmi)) {
+  if (check_num_overlappable_neighbors(mbmi) &&
+      is_motion_variation_allowed_bsize(bsize)) {
     av1_build_prediction_by_above_preds(cm, xd, mi_row, mi_col,
                                         args.above_pred_buf, dst_width1,
                                         dst_height1, args.above_pred_stride);