diff --git a/server/middlewares/apexAuthRedirect.ts b/server/middlewares/apexAuthRedirect.ts index b2139c13af..44d2ccf3c9 100644 --- a/server/middlewares/apexAuthRedirect.ts +++ b/server/middlewares/apexAuthRedirect.ts @@ -39,9 +39,12 @@ export default function apexAuthRedirect({ try { const team = await Team.findByPk(teamId, { attributes: ["id", "domain", "subdomain"], - rejectOnEmpty: true, }); + if (!team) { + return ctx.redirect(getErrorPath(ctx)); + } + return parseDomain(ctx.host).teamSubdomain === team.subdomain ? ctx.redirect("/") : ctx.redirectOnClient(getRedirectPath(ctx, team));