diff --git a/vendorsetup.sh b/vendorsetup.sh
index 8b57fe35a7c336849eb3f5663de50d8164b0608a..a689f1e78ec747ee537187b39b897cb63a59491a 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -38,6 +38,12 @@ B2G_TREEID_SH=${B2G_TREEID_SH:-device/qcom/b2g_common/treeid.sh}
 B2G_HASHED_FILES="${B2G_HASHED_FILES:-"device/qcom/b2g_common/vendorsetup.sh ${B2G_TREEID_SH}"}"
 REPO="${REPO:-repo}"
 
+# Look for patch trees
+B2G_PATCH_DIRS=$(LANG=C sort -u <( \
+  test -d device && find -L device -maxdepth 4 -type d -name patch ; \
+  test -d vendor && find -L vendor -maxdepth 4 -type d -name patch \
+) 2> /dev/null)
+
 __tree_md5sum()
 {
    (
@@ -72,13 +78,6 @@ __patch_tree()
       cd $(gettop)
       local TREE_ID=${B2G_TREE_ID:-$(${B2G_TREEID_SH})}
 
-      local B2G_PATCH_DIRS=$( \
-        LANG=C sort -u <( \
-          test -d device && find -L device -maxdepth 4 -type d -name patch ; \
-          test -d vendor && find -L vendor -maxdepth 4 -type d -name patch \
-        ) 2> /dev/null \
-      )
-
       echo "Tree IDs: ${TREE_ID}"
       echo "Patch directories: "
       for d in ${B2G_PATCH_DIRS}; do