diff --git a/salt/salt/minion.sls b/salt/salt/minion.sls
index 83de891648..2cc0327451 100644
--- a/salt/salt/minion.sls
+++ b/salt/salt/minion.sls
@@ -71,6 +71,7 @@ enable_startup_states:
   file.uncomment:
     - name: /etc/salt/minion
     - regex: '^startup_states: highstate$'
+    - unless: pgrep so-setup
 
 # prior to 2.4.30 this managed file would restart the salt-minion service when updated
 # since this file is currently only adding a sleep timer on service start
diff --git a/setup/so-functions b/setup/so-functions
index 8482b2e717..e6fd36044c 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -543,6 +543,13 @@ configure_minion() {
 	} >> "$setup_log" 2>&1
 }
 
+checkin_at_boot() {
+	local minion_config=/etc/salt/minion
+
+	info "Enabling checkin at boot"
+	sed -i 's/#startup_states: highstate/startup_states: highstate/' "$minion_config"
+}
+
 check_requirements() {
 	local req_mem
 	local req_cores
diff --git a/setup/so-setup b/setup/so-setup
index 9d210f00cc..ca1581ef90 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -781,6 +781,7 @@ if ! [[ -f $install_opt_file ]]; then
 			title "Setting up Playbook"
 			logCmd "so-playbook-reset"
 		fi
+		checkin_at_boot
 		set_initial_firewall_access
 		logCmd "salt-call schedule.enable -linfo --local"
 		verify_setup