diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index f9711757bfe0fa264c0ef2ccb8a306751a8fba29..2f83212549c91aa836e004f48237cd4da09a9e02 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -1776,8 +1776,8 @@ static void rd_pick_partition(VP9_COMP *cpi, TOKENEXTRA **tp, int mi_row,
       } else {
         // skip rectangular partition test when larger block size
         // gives better rd cost
-        do_rect &= !partition_none_allowed &&
-                   cpi->sf.less_rectangular_check;
+        if (cpi->sf.less_rectangular_check)
+          do_rect &= !partition_none_allowed;
       }
     }
     partition_split_done = 1;