diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix
index c92ec2508490..157a6c6b84e3 100644
--- a/nixos/modules/services/databases/redis.nix
+++ b/nixos/modules/services/databases/redis.nix
@@ -479,12 +479,12 @@ in
         isSystemUser = true;
         group = redisName name;
       }
-    ) enabledServers;
+    ) (lib.filterAttrs (name: conf: conf.user == redisName name) enabledServers);
     users.groups = lib.mapAttrs' (
       name: conf:
       lib.nameValuePair (redisName name) {
       }
-    ) enabledServers;
+    ) (lib.filterAttrs (name: conf: conf.group == redisName name) enabledServers);
 
     systemd.services = lib.mapAttrs' (
       name: conf: