diff --git a/packages/plugin-multi-tenant/src/queries/findTenantOptions.ts b/packages/plugin-multi-tenant/src/queries/findTenantOptions.ts index 3d41343cc8..ae98cbe6a3 100644 --- a/packages/plugin-multi-tenant/src/queries/findTenantOptions.ts +++ b/packages/plugin-multi-tenant/src/queries/findTenantOptions.ts @@ -14,6 +14,7 @@ export const findTenantOptions = async ({ useAsTitle, user, }: Args): Promise => { + const isOrderable = payload.collections[tenantsCollectionSlug]?.config?.orderable || false return payload.find({ collection: tenantsCollectionSlug, depth: 0, @@ -21,8 +22,9 @@ export const findTenantOptions = async ({ overrideAccess: false, select: { [useAsTitle]: true, + ...(isOrderable ? { _order: true } : {}), }, - sort: useAsTitle, + sort: isOrderable ? '_order' : useAsTitle, user, }) }