diff --git a/Tools/portbuild/scripts/dosetupnode b/Tools/portbuild/scripts/dosetupnode
index b45a623e2f1d..c3e3ffcabcdd 100755
--- a/Tools/portbuild/scripts/dosetupnode
+++ b/Tools/portbuild/scripts/dosetupnode
@@ -26,7 +26,7 @@ md5=$(/sbin/md5 ${pb}/${arch}/${branch}/tarballs/bindist.tar | awk '{print $4}')
 
 scp -p ${pb}/scripts/setupnode ${client_user}@${node}:/tmp
 ssh -n ${client_user}@${node} ${sudo_cmd} sh /tmp/setupnode $(hostname) ${pb} ${arch} ${branch} ${scratchdir} ${md5} ${disconnected}
-if [ ! -z "${sudo_cmd}" ]; then
+if [ ! -z "${sudo_cmd}" -a ${disconnected} = "1" ]; then
   ssh -n ${client_user}@${node} ${sudo_cmd} "chown -R ${client_user} /var/portbuild/"
 fi