diff --git a/hydra-module.nix b/hydra-module.nix
index 12c76e35..470f842d 100644
--- a/hydra-module.nix
+++ b/hydra-module.nix
@@ -232,8 +232,8 @@ in
         path = [ pkgs.nettools ];
         environment = env;
         serviceConfig =
-          { ExecStartPre = "${cfg.package}/bin/hydra-queue-runner --unlock";
-            ExecStart = "@${cfg.package}/bin/hydra-queue-runner hydra-queue-runner";
+          { ExecStart = "@${cfg.package}/bin/hydra-queue-runner hydra-queue-runner";
+            ExecStopPost = "${cfg.package}/bin/hydra-queue-runner --unlock";
             User = "hydra";
             Restart = "always";
           };