diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup
index 7fe7f07c4..9b9358693 100755
--- a/salt/common/tools/sbin/soup
+++ b/salt/common/tools/sbin/soup
@@ -34,6 +34,13 @@ check_err() {
   local err_msg="Unhandled error occured, please check $SOUP_LOG for details."
 
   [[ $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
     printf '%s' "Soup failed with error $exit_code: "
     case $exit_code in
@@ -91,11 +98,7 @@ check_err() {
     if [[ $exit_code -ge 64 && $exit_code -le 113 ]]; then
       echo "$err_msg"
     fi
-    set +e
-    systemctl_func "start" "$cron_service_name"
-    systemctl_func "start" "salt-master"
-    systemctl_func "start" "salt-minion"
-    enable_highstate
+
     exit $exit_code
   fi