diff --git a/apps/web/playwright/booking-pages.e2e.ts b/apps/web/playwright/booking-pages.e2e.ts
index 6e5cc7a3e9..d4a4f78c25 100644
--- a/apps/web/playwright/booking-pages.e2e.ts
+++ b/apps/web/playwright/booking-pages.e2e.ts
@@ -47,6 +47,13 @@ test("check SSR and OG - User Event Type", async ({ page, users }) => {
   const canonicalLink = document.querySelector('link[rel="canonical"]')?.getAttribute("href");
   expect(titleText).toContain(name);
   expect(ogUrl).toEqual(`${WEBAPP_URL}/${user.username}/30-min`);
+  const avatarLocators = await page.locator('[data-testid="avatar-href"]').all();
+  expect(avatarLocators.length).toBe(1);
+
+  for (const avatarLocator of avatarLocators) {
+    expect(await avatarLocator.getAttribute("href")).toEqual(`${WEBAPP_URL}/${user.username}?redirect=false`);
+  }
+
   expect(canonicalLink).toEqual(`${WEBAPP_URL}/${user.username}/30-min`);
   // Verify that there is correct URL that would generate the awesome OG image
   expect(ogImage).toContain(
diff --git a/packages/features/bookings/components/event-meta/Members.tsx b/packages/features/bookings/components/event-meta/Members.tsx
index 7e36f90151..6e718d5990 100644
--- a/packages/features/bookings/components/event-meta/Members.tsx
+++ b/packages/features/bookings/components/event-meta/Members.tsx
@@ -32,7 +32,7 @@ export const EventMembers = ({ schedulingType, users, profile, entity }: EventMe
     (profile.name !== users[0].name && schedulingType === SchedulingType.COLLECTIVE);
 
   const orgOrTeamAvatarItem =
-    isDynamic || (!profile.image && !entity.logoUrl)
+    isDynamic || (!profile.image && !entity.logoUrl) || !entity.teamSlug
       ? []
       : [
           {
@@ -47,6 +47,7 @@ export const EventMembers = ({ schedulingType, users, profile, entity }: EventMe
             title: entity.name ?? profile.name ?? "",
           },
         ];
+
   return (
     <>
       <AvatarGroup
diff --git a/packages/ui/components/avatar/Avatar.tsx b/packages/ui/components/avatar/Avatar.tsx
index 6fd5c75ce0..07ee3808fd 100644
--- a/packages/ui/components/avatar/Avatar.tsx
+++ b/packages/ui/components/avatar/Avatar.tsx
@@ -66,7 +66,11 @@ export function Avatar(props: AvatarProps) {
   );
 
   if (href) {
-    avatar = <Link href={href}>{avatar}</Link>;
+    avatar = (
+      <Link data-testid="avatar-href" href={href}>
+        {avatar}
+      </Link>
+    );
   }
 
   return title ? (