diff --git a/packages/better-auth/src/plugins/organization/routes/crud-members.ts b/packages/better-auth/src/plugins/organization/routes/crud-members.ts index 5c2b93170a..7d1c4d61ec 100644 --- a/packages/better-auth/src/plugins/organization/routes/crud-members.ts +++ b/packages/better-auth/src/plugins/organization/routes/crud-members.ts @@ -971,22 +971,21 @@ export const getActiveMemberRole = ( let organizationId = ctx.query?.organizationId || session.session.activeOrganizationId; const adapter = getOrgAdapter(ctx.context, options); - if (!organizationId) { - if (ctx.query?.organizationSlug) { - const organization = await adapter.findOrganizationBySlug( - ctx.query?.organizationSlug, - ); - if (!organization) { - throw new APIError("BAD_REQUEST", { - message: ORGANIZATION_ERROR_CODES.ORGANIZATION_NOT_FOUND, - }); - } - organizationId = organization.id; - } else { + if (ctx.query?.organizationSlug) { + const organization = await adapter.findOrganizationBySlug( + ctx.query?.organizationSlug, + ); + if (!organization) { throw new APIError("BAD_REQUEST", { - message: ORGANIZATION_ERROR_CODES.NO_ACTIVE_ORGANIZATION, + message: ORGANIZATION_ERROR_CODES.ORGANIZATION_NOT_FOUND, }); } + organizationId = organization.id; + } + if (!organizationId) { + throw new APIError("BAD_REQUEST", { + message: ORGANIZATION_ERROR_CODES.NO_ACTIVE_ORGANIZATION, + }); } const isMember = await adapter.findMemberByOrgId({ userId: session.user.id,