diff --git a/salt/common/tools/sbin/so-common b/salt/common/tools/sbin/so-common
index 2b557a306..6ae35324f 100755
--- a/salt/common/tools/sbin/so-common
+++ b/salt/common/tools/sbin/so-common
@@ -249,10 +249,8 @@ download_and_verify() {
 	fi
 
 	if ! verify_md5_checksum "$dest_file" "$md5_file"; then
-		set +e
 		retry 15 10 "curl --fail --retry 5 --retry-delay 15 -L '$source_url' --output '$dest_file'" "" ""
 		retry 15 10 "curl --fail --retry 5 --retry-delay 15 -L '$source_md5_url' --output '$md5_file'"  "" ""
-		set -e
 
 		if verify_md5_checksum "$dest_file" "$md5_file"; then
 		  echo "Source file and checksum are good."
diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup
index b14cf97e7..452300bba 100755
--- a/salt/manager/tools/sbin/soup
+++ b/salt/manager/tools/sbin/soup
@@ -843,8 +843,10 @@ determine_elastic_agent_upgrade() {
   if [[ $is_airgap -eq 0 ]]; then
     update_elastic_agent_airgap
   else
+    set +e
     # the new elasticsearch defaults.yaml file is not yet placed in /opt/so/saltstack/default/salt/elasticsearch yet
     update_elastic_agent "$UPDATE_DIR"
+    set -e
   fi
 }