diff --git a/server/src/modules/auth/jwt.strategy.ts b/server/src/modules/auth/jwt.strategy.ts
index 72180f282f..438429aa63 100644
--- a/server/src/modules/auth/jwt.strategy.ts
+++ b/server/src/modules/auth/jwt.strategy.ts
@@ -66,7 +66,7 @@ export class JwtStrategy extends PassportStrategy(Strategy) {
     let user: User;
     if (payload?.sub && organizationId && !isInviteSession) {
       user = await this.usersService.findByEmail(payload.sub, organizationId, WORKSPACE_USER_STATUS.ACTIVE);
-      user.organizationId = organizationId;
+      if (user) user.organizationId = organizationId;
     } else if (payload?.sub && isInviteSession) {
       /* Fetch user details for organization-invite and accept-invite route */
       user = await this.usersService.findOne({ email: payload?.sub, status: USER_STATUS.ACTIVE });