diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index 545c0091e5..2a183b3c74 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -1938,7 +1938,7 @@ pkg_repo_rsync() {
 		print_error_pfS
 	fi
 
-	if [ -z "${USE_PKG_REPO_STAGING}" ]; then
+	if [ -z "${USE_PKG_REPO_STAGING}" -o -z "${PKG_FINAL_RSYNC_HOSTNAME}" ]; then
 		return
 	fi