diff --git a/apps/nextjs/src/components/user-avatar.tsx b/apps/nextjs/src/components/user-avatar.tsx
index 0c3e5bd39..0a4db570e 100644
--- a/apps/nextjs/src/components/user-avatar.tsx
+++ b/apps/nextjs/src/components/user-avatar.tsx
@@ -14,7 +14,7 @@ export const UserAvatar = async ({ size }: UserAvatarProps) => {
     color: "primaryColor",
   } satisfies Partial<AvatarProps>;
 
-  if (!currentSession) return <Avatar {...commonProps} />;
+  if (!currentSession?.user) return <Avatar {...commonProps} />;
   if (currentSession.user.image)
     return (
       <Avatar