diff --git a/packages/trpc/server/routers/viewer/eventTypes/getByViewer.handler.ts b/packages/trpc/server/routers/viewer/eventTypes/getByViewer.handler.ts
index 1760fce192..dfd9553b3d 100644
--- a/packages/trpc/server/routers/viewer/eventTypes/getByViewer.handler.ts
+++ b/packages/trpc/server/routers/viewer/eventTypes/getByViewer.handler.ts
@@ -172,13 +172,16 @@ export const getByViewerHandler = async ({ ctx }: GetByViewerOptions) => {
   const mergedEventTypes = Object.values(eventTypesHashMap)
     .map((eventType) => eventType)
     .filter((evType) => evType.schedulingType !== SchedulingType.MANAGED);
+
+  const image = user?.username ? `${CAL_URL}/${user.username}/avatar.png` : undefined;
+
   eventTypeGroups.push({
     teamId: null,
     membershipRole: null,
     profile: {
       slug: user.username,
       name: user.name,
-      image: user.avatar || undefined,
+      image,
     },
     eventTypes: orderBy(mergedEventTypes, ["position", "id"], ["desc", "asc"]),
     metadata: {
@@ -214,10 +217,11 @@ export const getByViewerHandler = async ({ ctx }: GetByViewerOptions) => {
     eventTypeGroups: eventTypeGroups.filter((groupBy) => !!groupBy.eventTypes?.length),
     // so we can show a dropdown when the user has teams
     profiles: eventTypeGroups.map((group) => ({
-      teamId: group.teamId,
-      membershipRole: group.membershipRole,
       ...group.profile,
       ...group.metadata,
+      teamId: group.teamId,
+      membershipRole: group.membershipRole,
+      image: `${CAL_URL}/${group.profile.slug}/avatar.png`,
     })),
   };
 };
diff --git a/packages/trpc/server/routers/viewer/webhook/getByViewer.handler.ts b/packages/trpc/server/routers/viewer/webhook/getByViewer.handler.ts
index 54436b6b91..6faaea5053 100644
--- a/packages/trpc/server/routers/viewer/webhook/getByViewer.handler.ts
+++ b/packages/trpc/server/routers/viewer/webhook/getByViewer.handler.ts
@@ -77,12 +77,13 @@ export const getByViewerHandler = async ({ ctx }: GetByViewerOptions) => {
   const userWebhooks = user.webhooks;
   let webhookGroups: WebhookGroup[] = [];
 
+  const image = user?.username ? `${CAL_URL}/${user.username}/avatar.png` : undefined;
   webhookGroups.push({
     teamId: null,
     profile: {
       slug: user.username,
       name: user.name,
-      image: user.avatar || undefined,
+      image,
     },
     webhooks: userWebhooks,
     metadata: {
diff --git a/packages/trpc/server/routers/viewer/workflows/getByViewer.handler.ts b/packages/trpc/server/routers/viewer/workflows/getByViewer.handler.ts
index efd0b67bbf..45050d8df1 100644
--- a/packages/trpc/server/routers/viewer/workflows/getByViewer.handler.ts
+++ b/packages/trpc/server/routers/viewer/workflows/getByViewer.handler.ts
@@ -80,12 +80,13 @@ export const getByViewerHandler = async ({ ctx }: GetByViewerOptions) => {
 
   let workflowGroups: WorkflowGroup[] = [];
 
+  const image = user?.username ? `${CAL_URL}/${user.username}/avatar.png` : undefined;
   workflowGroups.push({
     teamId: null,
     profile: {
       slug: user.username,
       name: user.name,
-      image: user.avatar || undefined,
+      image,
     },
     workflows: userWorkflows,
     metadata: {