diff --git a/setup/so-functions b/setup/so-functions
index 9f903dd47..099f27317 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1412,21 +1412,22 @@ reserve_group_ids() {
 }
 
 reinstall_init() {
+	is_reinstall=0
+	export is_reinstall
 
 	# Move last setup log to backup
 	mv $setup_log $setup_log.bak
 
-	# Stop salt so it won't highstate and start containers back up.
-	if [[ $install_type =~ ^(MANAGER|EVAL|HELIXSENSOR|MANAGERSEARCH|STANDALONE|IMPORT)$ ]]; then
-		systemctl stop salt-master
-	fi
-	systemctl stop salt-minion
+	{
+		# Remove startup_states from minion config so we don't immediately highstate when salt starts back up
+		sed -i '/startup_states/d' $minion_config
 
-	# Remove startup highstate from minion config so we don't immediately highstate when salt starts back up
-	sed -i '/startup_states/d' $minion_config
+		# Disable schedule so highstate doesn't start running during the install
+		salt-call -l info schedule.disable
 
-	# Stop all containers so files can be changed with more safety
-	docker stop $(docker ps -a -q)
+		# Stop all containers so files can be changed with more safety
+		docker stop $(docker ps -a -q)
+	} >> $setup_log 2>&1
 }
 
 # When updating the salt version, also update the version in securityonion-builds/images/iso-task/Dockerfile and salt/salt/master.defaults.yaml and salt/salt/minion.defaults.yaml