diff --git a/setup/so-functions b/setup/so-functions
index 3a0da7bda..e49d0dbea 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1584,7 +1584,9 @@ reinstall_init() {
 		# Kill any salt processes (safely)
 		for service in "${salt_services[@]}"; do
 			# Stop the service in the background so we can exit after a certain amount of time
-			systemctl stop "$service" &
+			if check_service_status "$service"; then
+				systemctl stop "$service" &
+			fi
 			local pid=$!
 
 			local count=0