diff --git a/docs/_snippets/tanstack-react-add-framework.md b/docs/_snippets/tanstack-react-add-framework.md
index 9543e4b6eac4..308836bfde5f 100644
--- a/docs/_snippets/tanstack-react-add-framework.md
+++ b/docs/_snippets/tanstack-react-add-framework.md
@@ -21,5 +21,3 @@ export default defineMain({
 +  framework: '@storybook/tanstack-react',
 });
 ```
-
-<!-- JS snippets still needed while providing both CSF 3 & Next -->
diff --git a/docs/_snippets/tanstack-react-framework-options.md b/docs/_snippets/tanstack-react-framework-options.md
index c0ef2145e148..9b6c9a22ad56 100644
--- a/docs/_snippets/tanstack-react-framework-options.md
+++ b/docs/_snippets/tanstack-react-framework-options.md
@@ -29,5 +29,3 @@ export default defineMain({
   },
 });
 ```
-
-<!-- JS snippets still needed while providing both CSF 3 & Next -->
diff --git a/docs/_snippets/tanstack-react-mock-module-preview.md b/docs/_snippets/tanstack-react-mock-module-preview.md
index e6c847fdf0fd..5b0c0a9e4b0d 100644
--- a/docs/_snippets/tanstack-react-mock-module-preview.md
+++ b/docs/_snippets/tanstack-react-mock-module-preview.md
@@ -16,5 +16,3 @@ sb.mock(import('../src/db/client.ts'));
 
 export default definePreview({});
 ```
-
-<!-- JS snippets still needed while providing both CSF 3 & Next -->
diff --git a/docs/_snippets/tanstack-react-mock-server-fn-stories.md b/docs/_snippets/tanstack-react-mock-server-fn-stories.md
index 381d319b44cf..7e3146525adf 100644
--- a/docs/_snippets/tanstack-react-mock-server-fn-stories.md
+++ b/docs/_snippets/tanstack-react-mock-server-fn-stories.md
@@ -61,5 +61,3 @@ export const Failure = meta.story({
   },
 });
 ```
-
-<!-- JS snippets still needed while providing both CSF 3 & Next -->
diff --git a/docs/_snippets/tanstack-react-plain-component-story.md b/docs/_snippets/tanstack-react-plain-component-story.md
index 39d46c7d1741..9be12fae6900 100644
--- a/docs/_snippets/tanstack-react-plain-component-story.md
+++ b/docs/_snippets/tanstack-react-plain-component-story.md
@@ -47,5 +47,3 @@ export const Default = meta.story({
   },
 });
 ```
-
-<!-- JS snippets still needed while providing both CSF 3 & Next -->
diff --git a/docs/_snippets/tanstack-react-preview-migrate.md b/docs/_snippets/tanstack-react-preview-migrate.md
index 718be6e3461b..734dae62560c 100644
--- a/docs/_snippets/tanstack-react-preview-migrate.md
+++ b/docs/_snippets/tanstack-react-preview-migrate.md
@@ -17,5 +17,3 @@ export default definePreview({
   //...
 });
 ```
-
-<!-- JS snippets still needed while providing both CSF 3 & Next -->
diff --git a/docs/_snippets/tanstack-react-query-in-story.md b/docs/_snippets/tanstack-react-query-in-story.md
index 8fc590cf4a67..4cf1591ca718 100644
--- a/docs/_snippets/tanstack-react-query-in-story.md
+++ b/docs/_snippets/tanstack-react-query-in-story.md
@@ -47,5 +47,3 @@ export const LoggedIn = meta.story({
   },
 });
 ```
-
-<!-- JS snippets still needed while providing both CSF 3 & Next -->
diff --git a/docs/_snippets/tanstack-react-query-setup.md b/docs/_snippets/tanstack-react-query-setup.md
index 6aeaca45760e..c1f2d67988b3 100644
--- a/docs/_snippets/tanstack-react-query-setup.md
+++ b/docs/_snippets/tanstack-react-query-setup.md
@@ -1,5 +1,6 @@
 ```tsx filename=".storybook/preview.tsx" renderer="react" language="tsx" tabTitle="CSF 3"
 import { type QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import type { Preview } from '@storybook/tanstack-react';
 
 // 👇 Create a new QueryClient
 const queryClient = new QueryClient({
@@ -11,7 +12,7 @@ const queryClient = new QueryClient({
   },
 });
 
-export default {
+const preview: Preview = {
   beforeEach: () => {
     // 👇 Clear the cache between stories so each story starts fresh
     queryClient.clear();
@@ -19,7 +20,7 @@ export default {
   parameters: {
     tanstack: {
       router: {
-        // 👇 Make queryClient available to route loaders via ctx.context.queryClient
+        // 👇 Make queryClient available in stories' beforeEach via ctx.context.queryClient
         context: { queryClient },
       },
     },
@@ -33,6 +34,8 @@ export default {
     ),
   ],
 };
+
+export default preview;
 ```
 
 ```tsx filename=".storybook/preview.tsx" renderer="react" language="tsx" tabTitle="CSF Next 🧪"
@@ -57,7 +60,7 @@ export default definePreview({
   parameters: {
     tanstack: {
       router: {
-        // 👇 Make queryClient available to route loaders via ctx.context.queryClient
+        // 👇 Make queryClient available in stories' beforeEach via ctx.context.queryClient
         context: { queryClient },
       },
     },
@@ -72,5 +75,3 @@ export default definePreview({
   ],
 });
 ```
-
-<!-- JS snippets still needed while providing both CSF 3 & Next -->
diff --git a/docs/_snippets/tanstack-react-route-story.md b/docs/_snippets/tanstack-react-route-story.md
index 7f185680d993..c9edf8d8bdfc 100644
--- a/docs/_snippets/tanstack-react-route-story.md
+++ b/docs/_snippets/tanstack-react-route-story.md
@@ -83,5 +83,3 @@ export const WithCustomLoader = meta.story({
   },
 });
 ```
-
-<!-- JS snippets still needed while providing both CSF 3 & Next -->
diff --git a/docs/_snippets/tanstack-react-route-tree-overrides.md b/docs/_snippets/tanstack-react-route-tree-overrides.md
index e88afd98d962..f1f43223a9b4 100644
--- a/docs/_snippets/tanstack-react-route-tree-overrides.md
+++ b/docs/_snippets/tanstack-react-route-tree-overrides.md
@@ -52,5 +52,3 @@ const meta = preview.meta({
 
 export const Default = meta.story();
 ```
-
-<!-- JS snippets still needed while providing both CSF 3 & Next -->