diff --git a/packages/better-auth/src/plugins/organization/adapter.ts b/packages/better-auth/src/plugins/organization/adapter.ts index 70a3fc4680..0774ba05b7 100644 --- a/packages/better-auth/src/plugins/organization/adapter.ts +++ b/packages/better-auth/src/plugins/organization/adapter.ts @@ -350,11 +350,14 @@ export const getOrgAdapter = ( if (!org) return null; const userIds = members.map((member) => member.userId); - const users = await adapter.findMany({ - model: "user", - where: [{ field: "id", value: userIds, operator: "in" }], - limit: options?.membershipLimit || 100, - }); + const users = + userIds.length > 0 + ? await adapter.findMany({ + model: "user", + where: [{ field: "id", value: userIds, operator: "in" }], + limit: options?.membershipLimit || 100, + }) + : []; const userMap = new Map(users.map((user) => [user.id, user])); const membersWithUsers = members.map((member) => {