diff --git a/nixos/module/generic/matrix-cluster-users.nix b/nixos/module/generic/matrix-cluster-users.nix
index a43c5455..d8a30e4e 100644
--- a/nixos/module/generic/matrix-cluster-users.nix
+++ b/nixos/module/generic/matrix-cluster-users.nix
@@ -18,26 +18,30 @@
   ];
 
   adminNames = [ "yukkop" ];
-in {
-  hectic.generic.matrix-cluster.users = builtins.listToAttrs (
-    map (name: {
-      inherit name;
-      value = {
-        passwordFile = config.sops.secrets."matrix/users/${name}/password".path;
-      } // lib.optionalAttrs (builtins.elem name adminNames) {
-        admin = true;
-      };
-    }) userNames
-  );
 
-  sops.secrets = builtins.listToAttrs (
-    map (name: {
-      name = "matrix/users/${name}/password";
-      value = {
-        key      = "matrix/users/${name}/password";
-        owner    = "matrix-synapse";
-        sopsFile = "${flake}/sus/matrix-cluster.yaml";
-      };
-    }) userNames
-  );
+  cfg = config.hectic.generic.matrix-cluster;
+in {
+  config = lib.mkIf cfg.enable {
+    hectic.generic.matrix-cluster.users = builtins.listToAttrs (
+      map (name: {
+        inherit name;
+        value = {
+          passwordFile = config.sops.secrets."matrix/users/${name}/password".path;
+        } // lib.optionalAttrs (builtins.elem name adminNames) {
+          admin = true;
+        };
+      }) userNames
+    );
+
+    sops.secrets = builtins.listToAttrs (
+      map (name: {
+        name = "matrix/users/${name}/password";
+        value = {
+          key      = "matrix/users/${name}/password";
+          owner    = "matrix-synapse";
+          sopsFile = "${flake}/sus/matrix-cluster.yaml";
+        };
+      }) userNames
+    );
+  }
 }