diff --git a/apps/nextjs/src/app/[locale]/boards/(content)/_creator.tsx b/apps/nextjs/src/app/[locale]/boards/(content)/_creator.tsx
index 1d543de05..761e4ffc4 100644
--- a/apps/nextjs/src/app/[locale]/boards/(content)/_creator.tsx
+++ b/apps/nextjs/src/app/[locale]/boards/(content)/_creator.tsx
@@ -26,6 +26,7 @@ export const createBoardContentPage = <
     layout: createBoardLayout({
       headerActions: <BoardContentHeaderActions />,
       getInitialBoard,
+      isBoardContentPage: true,
     }),
     page: () => {
       return <ClientBoard />;
diff --git a/apps/nextjs/src/app/[locale]/boards/[name]/layout.tsx b/apps/nextjs/src/app/[locale]/boards/[name]/layout.tsx
index 2fc15aebf..108e7f222 100644
--- a/apps/nextjs/src/app/[locale]/boards/[name]/layout.tsx
+++ b/apps/nextjs/src/app/[locale]/boards/[name]/layout.tsx
@@ -8,4 +8,5 @@ export default createBoardLayout<{ locale: string; name: string }>({
   async getInitialBoard({ name }) {
     return await api.board.getBoardByName({ name });
   },
+  isBoardContentPage: false,
 });
diff --git a/apps/nextjs/src/app/[locale]/boards/_layout-creator.tsx b/apps/nextjs/src/app/[locale]/boards/_layout-creator.tsx
index dbb946a68..30dcd1e30 100644
--- a/apps/nextjs/src/app/[locale]/boards/_layout-creator.tsx
+++ b/apps/nextjs/src/app/[locale]/boards/_layout-creator.tsx
@@ -17,11 +17,13 @@ import { BoardMantineProvider } from "./(content)/_theme";
 interface CreateBoardLayoutProps<TParams extends Params> {
   headerActions: JSX.Element;
   getInitialBoard: (params: TParams) => Promise<Board>;
+  isBoardContentPage: boolean;
 }
 
 export const createBoardLayout = <TParams extends Params>({
   headerActions,
   getInitialBoard,
+  isBoardContentPage,
 }: CreateBoardLayoutProps<TParams>) => {
   const Layout = async ({
     params,
@@ -39,7 +41,10 @@ export const createBoardLayout = <TParams extends Params>({
     });
 
     return (
-      <GlobalItemServerDataRunner board={initialBoard}>
+      <GlobalItemServerDataRunner
+        board={initialBoard}
+        shouldRun={isBoardContentPage}
+      >
         <BoardProvider initialBoard={initialBoard}>
           <BoardMantineProvider>
             <ClientShell hasNavigation={false}>
diff --git a/packages/widgets/src/server/runner.tsx b/packages/widgets/src/server/runner.tsx
index fa4a7d451..d3792574b 100644
--- a/packages/widgets/src/server/runner.tsx
+++ b/packages/widgets/src/server/runner.tsx
@@ -10,10 +10,17 @@ import { GlobalItemServerDataProvider } from "./provider";
 type Board = RouterOutputs["board"]["getDefaultBoard"];
 
 type Props = PropsWithChildren<{
+  shouldRun: boolean;
   board: Board;
 }>;
 
-export const GlobalItemServerDataRunner = ({ board, children }: Props) => {
+export const GlobalItemServerDataRunner = ({
+  board,
+  shouldRun,
+  children,
+}: Props) => {
+  if (!shouldRun) return children;
+
   const allItems = board.sections.flatMap((section) => section.items);
 
   return (