diff --git a/setup/so-functions b/setup/so-functions
index e7112163e..b00c066d8 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1790,7 +1790,7 @@ reinstall_init() {
 	local service_retry_count=20
 
 	{
-		if command -v salt-call &> /dev/null; then
+		if command -v salt-call &> /dev/null && grep -q "master:" /etc/salt/minion; then
 			# Disable schedule so highstate doesn't start running during the install
 			salt-call -l info schedule.disable