diff --git a/setup/so-setup b/setup/so-setup
index d3dd76202..b1c4ce42b 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -608,9 +608,6 @@ if ! [[ -f $install_opt_file ]]; then
 		securityonion_repo
 		# Update existing packages
 		update_packages
-		# Download Elastic Agent Artifacts
-		title "Downloading Elastic Agent Artifacts"
-		download_elastic_agent_artifacts
 		# Install salt
 		saltify
 		# Start the master service
@@ -627,6 +624,9 @@ if ! [[ -f $install_opt_file ]]; then
 		logCmd "salt-call state.apply docker"
 		firewall_generate_templates
 		set_initial_firewall_policy
+		# Download Elastic Agent Artifacts
+		title "Downloading Elastic Agent Artifacts"
+		download_elastic_agent_artifacts
 
 		generate_ca
 		generate_ssl