diff --git a/apps/web-next/src/app/about/page.tsx b/apps/web-next/src/app/about/page.tsx
index 9c25016..5f89088 100644
--- a/apps/web-next/src/app/about/page.tsx
+++ b/apps/web-next/src/app/about/page.tsx
@@ -2,10 +2,8 @@ import { dehydrate, HydrationBoundary } from "@tanstack/react-query";
 import { appRouter } from "@repo/core-api";
 import { getQueryClient } from "@repo/core-trpc";
 import { PageContent } from "@repo/marketing-pages/ui";
-import { bindAll } from "../../server/bind-production";
 
 export default async function AboutPage() {
-  await bindAll();
   const caller = appRouter.createCaller({});
   const queryClient = getQueryClient();
 
diff --git a/apps/web-next/src/app/api/trpc/[trpc]/route.ts b/apps/web-next/src/app/api/trpc/[trpc]/route.ts
index f1fddf3..94971f1 100644
--- a/apps/web-next/src/app/api/trpc/[trpc]/route.ts
+++ b/apps/web-next/src/app/api/trpc/[trpc]/route.ts
@@ -1,9 +1,7 @@
 import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
 import { appRouter } from "@repo/core-api";
-import { bindAll } from "../../../../server/bind-production";
 
 const handler = async (req: Request) => {
-  await bindAll();
   return fetchRequestHandler({
     endpoint: "/api/trpc",
     req,
diff --git a/apps/web-next/src/app/blog/[slug]/page.tsx b/apps/web-next/src/app/blog/[slug]/page.tsx
index 2a99c33..c637dcd 100644
--- a/apps/web-next/src/app/blog/[slug]/page.tsx
+++ b/apps/web-next/src/app/blog/[slug]/page.tsx
@@ -3,14 +3,12 @@ import { dehydrate, HydrationBoundary } from "@tanstack/react-query";
 import { appRouter } from "@repo/core-api";
 import { getQueryClient } from "@repo/core-trpc";
 import { ArticleDetail } from "@repo/blog/ui";
-import { bindAll } from "../../../server/bind-production";
 
 type PageProps = {
   params: Promise<{ slug: string }>;
 };
 
 export default async function BlogPostPage({ params }: PageProps) {
-  await bindAll();
   const { slug } = await params;
   const caller = appRouter.createCaller({});
   const queryClient = getQueryClient();
diff --git a/apps/web-next/src/app/layout.tsx b/apps/web-next/src/app/layout.tsx
index d5c36bd..b891133 100644
--- a/apps/web-next/src/app/layout.tsx
+++ b/apps/web-next/src/app/layout.tsx
@@ -1,6 +1,7 @@
 import type { Metadata } from "next";
 import "../styles/app.css";
 import { getNonce } from "@repo/core-shared/security/next";
+import { bindAll } from "../server/bind-production";
 import { Providers } from "./providers";
 
 export const metadata: Metadata = {
@@ -13,6 +14,7 @@ export default async function RootLayout({
 }: {
   children: React.ReactNode;
 }) {
+  await bindAll();
   const nonce = await getNonce();
 
   return (
diff --git a/apps/web-next/src/app/page.tsx b/apps/web-next/src/app/page.tsx
index f025554..fa18e7c 100644
--- a/apps/web-next/src/app/page.tsx
+++ b/apps/web-next/src/app/page.tsx
@@ -3,10 +3,8 @@ import { appRouter } from "@repo/core-api";
 import { getQueryClient } from "@repo/core-trpc";
 import { SiteHeader } from "@repo/navigation/ui";
 import { ArticleList } from "@repo/blog/ui";
-import { bindAll } from "../server/bind-production";
 
 export default async function Home() {
-  await bindAll();
   const caller = appRouter.createCaller({});
   const queryClient = getQueryClient();