diff --git a/src/user/user.service.ts b/src/user/user.service.ts
index 01812bc..4ca7762 100644
--- a/src/user/user.service.ts
+++ b/src/user/user.service.ts
@@ -125,7 +125,13 @@ export async function listUsers(user: AuthenticatedUser) {
     return await userModel
       .find({
         $and: [
-          { tenantId: user.tenantId, orgId: user.orgId, role: "client" },
+          { tenantId: user.tenantId },
+          {
+            $or: [
+              { orgId: user.orgId, role: "client" },
+              { role: { $in: ["admin", "team", "superAdmin"] } },
+            ],
+          },
           { dev: { $ne: true } },
         ],
       })