diff --git a/setup/so-functions b/setup/so-functions
index c28a1c6c7..d92cc8efa 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -387,6 +387,7 @@ collect_net_method() {
 	whiptail_net_method
 	if [[ "$network_traffic" == "PROXY"* ]]; then
 		collect_proxy no_ask
+		needs_proxy=true
 	fi
 }
 
diff --git a/setup/so-setup b/setup/so-setup
index 8ef8a102b..32feb8f9a 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -490,6 +490,9 @@ if ! [[ -f $install_opt_file ]]; then
 		percentage=0
 		es_heapsize
 		ls_heapsize
+		if [[ $needs_proxy ]]; then
+			set_proxy
+		fi
 		set_redirect
 		# Generate Interface Vars
 		generate_interface_vars