diff --git a/server/routes/app.ts b/server/routes/app.ts
index 1a895a735..23effcb7e 100644
--- a/server/routes/app.ts
+++ b/server/routes/app.ts
@@ -107,7 +107,7 @@ export const renderApp = async (
 };
 
 export const renderShare = async (ctx: Context, next: Next) => {
-  const rootShareId = ctx.state.rootShare?.id;
+  const rootShareId = ctx.state?.rootShare?.id;
   const shareId = rootShareId ?? ctx.params.shareId;
   const documentSlug = ctx.params.documentSlug;
 
diff --git a/server/utils/passport.ts b/server/utils/passport.ts
index bf9836c06..a28eaf35b 100644
--- a/server/utils/passport.ts
+++ b/server/utils/passport.ts
@@ -116,7 +116,7 @@ export async function getTeamFromContext(ctx: Context) {
     } else {
       team = await Team.findOne();
     }
-  } else if (ctx.state.rootShare) {
+  } else if (ctx.state?.rootShare) {
     team = await Team.findByPk(ctx.state.rootShare.teamId);
   } else if (domain.custom) {
     team = await Team.findOne({ where: { domain: domain.host } });