diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix
index 7e6e3d3873d8..c81cd20b263f 100644
--- a/nixos/modules/services/misc/taskserver/default.nix
+++ b/nixos/modules/services/misc/taskserver/default.nix
@@ -80,18 +80,19 @@ let
 
     # server
     server = ${cfg.listenHost}:${toString cfg.listenPort}
-    ${mkConfLine "server.crl" cfg.pki.server.crl}
-
-    # certificates
     ${mkConfLine "trust" cfg.trust}
+
+    # PKI options
     ${if needToCreateCA then ''
       ca.cert = ${cfg.dataDir}/keys/ca.cert
       server.cert = ${cfg.dataDir}/keys/server.cert
       server.key = ${cfg.dataDir}/keys/server.key
+      server.crl = ${cfg.dataDir}/keys/server.crl
     '' else ''
       ca.cert = ${cfg.pki.ca.cert}
       server.cert = ${cfg.pki.server.cert}
       server.key = ${cfg.pki.server.key}
+      server.crl = ${cfg.pki.server.crl}
     ''}
   '';