diff --git a/apps/ui-library/components/mdx-components.tsx b/apps/ui-library/components/mdx-components.tsx
index acdc4541d55..68d470a4a95 100644
--- a/apps/ui-library/components/mdx-components.tsx
+++ b/apps/ui-library/components/mdx-components.tsx
@@ -31,6 +31,7 @@ import {
   TabsList_Shadcn_ as TabsList,
   TabsTrigger_Shadcn_ as TabsTrigger,
 } from 'ui'
+import TanStackBeta from '@/components/tanstack-beta'
 import { Admonition } from 'ui-patterns/admonition'
 import { BlockItem } from './block-item'
 import { BlockPreview } from './block-preview'
@@ -248,6 +249,7 @@ const components = {
       {...props}
     />
   ),
+  TanStackBeta,
   // FrameworkDocs: ({ className, ...props }: React.ComponentProps<typeof FrameworkDocs>) => (
   //   <FrameworkDocs className={cn(className)} {...props} />
   // ),
diff --git a/apps/ui-library/components/tanstack-beta.tsx b/apps/ui-library/components/tanstack-beta.tsx
new file mode 100644
index 00000000000..b90cedb3757
--- /dev/null
+++ b/apps/ui-library/components/tanstack-beta.tsx
@@ -0,0 +1,30 @@
+import React from 'react'
+import { Callout } from './callout'
+import { TriangleAlert } from 'lucide-react'
+
+export default function TanStackBeta() {
+  return (
+    <div className="mt-4">
+      <Callout>
+        <div className="grid gap-2">
+          <div className="flex items-center gap-2 font-medium">
+            <TriangleAlert />
+            Heads up: TanStack Start is in beta.
+          </div>
+          We&apos;re excited to support TanStack Start in our UI library! But since it&apos;s still
+          in beta, things may change quickly — expect breaking changes and some rough edges.
+          We&apos;ll do our best to keep up and make integration with Supabase as smooth as
+          possible. If you run into issues, have a look at the TanStack docs.
+          <a
+            href="https://tanstack.com/start/latest/docs/framework/react/quick-start"
+            target="_blank"
+            rel="noopener noreferrer"
+            className="text-primary underline mt-1"
+          >
+            TanStack Quickstart guide
+          </a>
+        </div>
+      </Callout>
+    </div>
+  )
+}
diff --git a/apps/ui-library/content/docs/getting-started/quickstart.mdx b/apps/ui-library/content/docs/getting-started/quickstart.mdx
index c82490b554a..ade51c07240 100644
--- a/apps/ui-library/content/docs/getting-started/quickstart.mdx
+++ b/apps/ui-library/content/docs/getting-started/quickstart.mdx
@@ -60,6 +60,8 @@ If you're already using a recent version of shadcn/ui in your existing project,
   </LinkedCard>
 </div>
 
+<TanStackBeta />
+
 When you've finished setting up shadcn/ui, you can start exploring the components in the sidebar
 
 ## Troubleshooting
diff --git a/apps/ui-library/content/docs/tanstack/client.mdx b/apps/ui-library/content/docs/tanstack/client.mdx
index dc9477629f8..db80ba69be7 100644
--- a/apps/ui-library/content/docs/tanstack/client.mdx
+++ b/apps/ui-library/content/docs/tanstack/client.mdx
@@ -7,6 +7,8 @@ description: Supabase client for TanStack Start
 
 <BlockItem name="supabase-client-tanstack" description="Supabase Client for TanStack Start" />
 
+<TanStackBeta />
+
 ## Folder structure
 
 <RegistryBlock itemName="supabase-client-tanstack" />