diff --git a/src/service.c b/src/service.c
index 38ea58cd..34bbba9f 100644
--- a/src/service.c
+++ b/src/service.c
@@ -2571,6 +2571,11 @@ restart:
 		break;
 
 	case SVC_SETUP_STATE:
+		if (!enabled) {
+			service_stop(svc);
+			break;
+		}
+
 		if (!svc->pid) {
 			int rc = WEXITSTATUS(svc->status);
 			int ok = WIFEXITED(svc->status);