diff --git a/web/src/components/ui/avatar.tsx b/web/src/components/ui/avatar.tsx
index e30079b5e..cd95b8a8f 100644
--- a/web/src/components/ui/avatar.tsx
+++ b/web/src/components/ui/avatar.tsx
@@ -48,3 +48,49 @@ const AvatarFallback = React.forwardRef<
 AvatarFallback.displayName = AvatarPrimitive.Fallback.displayName;
 
 export { Avatar, AvatarFallback, AvatarImage };
+
+type AvatarProps = React.ComponentProps<typeof Avatar>;
+
+interface AvatarGroupProps extends React.ComponentProps<'div'> {
+  children: React.ReactElement<AvatarProps>[];
+  max?: number;
+}
+
+export const AvatarGroup = ({
+  children,
+  max,
+  className,
+  ...props
+}: AvatarGroupProps) => {
+  const totalAvatars = React.Children.count(children);
+  const displayedAvatars = React.Children.toArray(children)
+    .slice(0, max)
+    .reverse();
+  const remainingAvatars = max ? Math.max(totalAvatars - max, 1) : 0;
+
+  return (
+    <div
+      className={cn('flex items-center flex-row-reverse', className)}
+      {...props}
+    >
+      {remainingAvatars > 0 && (
+        <Avatar className="-ml-2 hover:z-10 relative ring-2 ring-background">
+          <AvatarFallback className="bg-muted-foreground text-white">
+            +{remainingAvatars}
+          </AvatarFallback>
+        </Avatar>
+      )}
+      {displayedAvatars.map((avatar, index) => {
+        if (!React.isValidElement(avatar)) return null;
+
+        return (
+          <div key={index} className="-ml-2 hover:z-10 relative">
+            {React.cloneElement(avatar as React.ReactElement<AvatarProps>, {
+              className: 'ring-2 ring-background',
+            })}
+          </div>
+        );
+      })}
+    </div>
+  );
+};
diff --git a/web/src/interfaces/database/user-setting.ts b/web/src/interfaces/database/user-setting.ts
index 67ccc69bc..933f80d9f 100644
--- a/web/src/interfaces/database/user-setting.ts
+++ b/web/src/interfaces/database/user-setting.ts
@@ -69,7 +69,7 @@ interface Es {
 }
 
 export interface ITenantUser {
-  avatar: null;
+  avatar: string;
   delta_seconds: number;
   email: string;
   is_active: string;