diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup
index 9b9358693..70e300cb0 100755
--- a/salt/common/tools/sbin/soup
+++ b/salt/common/tools/sbin/soup
@@ -35,13 +35,14 @@ check_err() {
 
   [[ $ERR_HANDLED == true ]] && exit $exit_code
 
-  set +e
-  systemctl_func "start" "$cron_service_name"
-  systemctl_func "start" "salt-master"
-  systemctl_func "start" "salt-minion"
-  enable_highstate
-
   if [[ $exit_code -ne 0 ]]; then
+  
+    set +e
+    systemctl_func "start" "$cron_service_name"
+    systemctl_func "start" "salt-master"
+    systemctl_func "start" "salt-minion"
+    enable_highstate
+
     printf '%s' "Soup failed with error $exit_code: "
     case $exit_code in
       2)