diff --git a/apps/web/lib/app-providers.tsx b/apps/web/lib/app-providers.tsx
index 3f3eda9d5bb7c6..c5c55a97def25e 100644
--- a/apps/web/lib/app-providers.tsx
+++ b/apps/web/lib/app-providers.tsx
@@ -1,7 +1,7 @@
 import { TooltipProvider } from "@radix-ui/react-tooltip";
 import { SessionProvider } from "next-auth/react";
 import { EventCollectionProvider } from "next-collect/client";
-import { appWithTranslation } from "next-i18next";
+import { appWithTranslation, SSRConfig } from "next-i18next";
 import { ThemeProvider } from "next-themes";
 import type { AppProps as NextAppProps, AppProps as NextJsAppProps } from "next/app";
 import { NextRouter } from "next/router";
@@ -14,9 +14,9 @@ import { MetaProvider } from "@calcom/ui/v2/core/Meta";
 
 import usePublicPage from "@lib/hooks/usePublicPage";
 
-const I18nextAdapter = appWithTranslation<NextJsAppProps & { children: React.ReactNode }>(({ children }) => (
-  <>{children}</>
-));
+const I18nextAdapter = appWithTranslation<NextJsAppProps<SSRConfig> & { children: React.ReactNode }>(
+  ({ children }) => <>{children}</>
+);
 
 // Workaround for https://github.com/vercel/next.js/issues/8592
 export type AppProps = Omit<NextAppProps, "Component"> & {
diff --git a/packages/trpc/server/routers/viewer.tsx b/packages/trpc/server/routers/viewer.tsx
index cf0fd618150098..c7c022946904c3 100644
--- a/packages/trpc/server/routers/viewer.tsx
+++ b/packages/trpc/server/routers/viewer.tsx
@@ -152,7 +152,7 @@ const loggedInViewerRouter = createProtectedRouter()
         locale: user.locale,
         timeFormat: user.timeFormat,
         timeZone: user.timeZone,
-        avatar: user.avatar,
+        avatar: `${CAL_URL}/${user.username}/avatar.png`,
         createdDate: user.createdDate,
         trialEndsAt: user.trialEndsAt,
         completedOnboarding: user.completedOnboarding,