diff --git a/nix/modules/spindle.nix b/nix/modules/spindle.nix
index 5aad22e8..949cb57e 100644
--- a/nix/modules/spindle.nix
+++ b/nix/modules/spindle.nix
@@ -771,9 +771,9 @@ in
           {
             spindle-mill-executors = mkIf hasExecutors {
               description = "register spindle mill executors";
-              after = ["spindle.service"];
-              wants = ["spindle.service"];
-              before = mapAttrsToList (name: _: "${executorServiceName name}.service") enabledExecutors;
+              before =
+                ["spindle.service"]
+                ++ mapAttrsToList (name: _: "${executorServiceName name}.service") enabledExecutors;
               wantedBy = ["multi-user.target"];
               serviceConfig = {
                 Type = "oneshot";
@@ -785,10 +785,13 @@ in
 
             spindle = {
               description = "spindle service";
-              after = [
-                "network.target"
-                "docker.service"
-              ];
+              after =
+                [
+                  "network.target"
+                  "docker.service"
+                ]
+                ++ optional hasExecutors "spindle-mill-executors.service";
+              requires = optional hasExecutors "spindle-mill-executors.service";
               wantedBy = ["multi-user.target"];
               path = deps;
               serviceConfig = {