diff --git a/setup/so-functions b/setup/so-functions
index 861dd2e14..2b757bad6 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -537,7 +537,15 @@ collect_patch_schedule_name_import() {
 
 collect_proxy() {
 	local ask=${1:-true}
-	if [[ $ask == true ]] && whiptail_proxy_ask; then
+	local use_proxy
+	if [[ $ask != true ]]; then
+		use_proxy=0
+	else
+		whiptail_proxy_ask
+		use_proxy=$?
+	fi
+
+	if [[ $use_proxy == 0 ]]; then
 
 		whiptail_proxy_addr