diff --git a/apps/nextjs/src/app/layout.tsx b/apps/nextjs/src/app/layout.tsx
index d0284ec..679537b 100644
--- a/apps/nextjs/src/app/layout.tsx
+++ b/apps/nextjs/src/app/layout.tsx
@@ -1,8 +1,6 @@
 import "~/app/globals.css";
 
 import type { Metadata, Viewport } from "next";
-import { cache } from "react";
-import { headers } from "next/headers";
 import { GeistMono } from "geist/font/mono";
 import { GeistSans } from "geist/font/sans";
 
@@ -39,14 +37,10 @@ export const viewport: Viewport = {
   ],
 };
 
-const getHeaders = cache(() => Promise.resolve(headers()));
-
 export default function RootLayout({
   children,
-  params,
 }: {
   children: React.ReactNode;
-  params: { locale: string };
 }) {
   return (
     // https://github.com/pacocoursey/next-themes/issues/224#issuecomment-1755634035
@@ -59,7 +53,7 @@ export default function RootLayout({
           GeistMono.className,
         )}
       >
-        <AppProvider headersPromise={getHeaders()}>{children}</AppProvider>
+        <AppProvider>{children}</AppProvider>
       </body>
     </html>
   );
diff --git a/apps/nextjs/src/app/providers.tsx b/apps/nextjs/src/app/providers.tsx
index 03cb10e..07e7cb4 100644
--- a/apps/nextjs/src/app/providers.tsx
+++ b/apps/nextjs/src/app/providers.tsx
@@ -12,15 +12,12 @@ import { TRPCReactProvider } from "~/trpc/react";
 
 type AppProviderProps = {
   children: ReactNode;
-  headersPromise: Promise<Headers>;
 };
 
-export const AppProvider = ({ children, headersPromise }: AppProviderProps) => {
+export const AppProvider = ({ children }: AppProviderProps) => {
   return (
     <ThemeProvider attribute="class" defaultTheme="system" enableSystem>
-      <TRPCReactProvider headersPromise={headersPromise}>
-        {children}
-      </TRPCReactProvider>
+      <TRPCReactProvider>{children}</TRPCReactProvider>
       <div className="absolute bottom-4 right-4">
         <ThemeToggle />
       </div>
diff --git a/apps/nextjs/src/trpc/react.tsx b/apps/nextjs/src/trpc/react.tsx
index 458b57b..f5fd142 100644
--- a/apps/nextjs/src/trpc/react.tsx
+++ b/apps/nextjs/src/trpc/react.tsx
@@ -10,10 +10,7 @@ import type { AppRouter } from "@vyductan/api";
 
 export const api = createTRPCReact<AppRouter>();
 
-export function TRPCReactProvider(props: {
-  children: React.ReactNode;
-  headersPromise: Promise<Headers>;
-}) {
+export function TRPCReactProvider(props: { children: React.ReactNode }) {
   const [queryClient] = useState(() => new QueryClient());
 
   const [trpcClient] = useState(() =>
@@ -28,7 +25,7 @@ export function TRPCReactProvider(props: {
         unstable_httpBatchStreamLink({
           url: getBaseUrl() + `/api/trpc`,
           headers: async () => {
-            const headers = new Headers(await props.headersPromise);
+            const headers = new Headers();
             headers.set("x-trpc-source", "nextjs-react");
             return headers;
           },