diff --git a/packages/create/src/frameworks/react/add-ons/clerk/assets/_dot_env.local.append b/packages/create/src/frameworks/react/add-ons/clerk/assets/_dot_env.local.append
index 831a8a2e..70b6be9a 100644
--- a/packages/create/src/frameworks/react/add-ons/clerk/assets/_dot_env.local.append
+++ b/packages/create/src/frameworks/react/add-ons/clerk/assets/_dot_env.local.append
@@ -1,2 +1,3 @@
 # Clerk configuration, get this key from your [Dashboard](dashboard.clerk.com)
 VITE_CLERK_PUBLISHABLE_KEY=
+CLERK_SECRET_KEY=
diff --git a/packages/create/src/frameworks/react/add-ons/clerk/assets/src/integrations/clerk/header-user.tsx b/packages/create/src/frameworks/react/add-ons/clerk/assets/src/integrations/clerk/header-user.tsx
index 69b4e834..0011cce3 100644
--- a/packages/create/src/frameworks/react/add-ons/clerk/assets/src/integrations/clerk/header-user.tsx
+++ b/packages/create/src/frameworks/react/add-ons/clerk/assets/src/integrations/clerk/header-user.tsx
@@ -1,19 +1,14 @@
-import {
-  SignedIn,
-  SignInButton,
-  SignedOut,
-  UserButton,
-} from '@clerk/clerk-react'
+import { Show, SignInButton, UserButton } from '@clerk/tanstack-react-start'
 
 export default function HeaderUser() {
   return (
     <>
-      <SignedIn>
+      <Show when="signed-in">
         <UserButton />
-      </SignedIn>
-      <SignedOut>
+      </Show>
+      <Show when="signed-out">
         <SignInButton />
-      </SignedOut>
+      </Show>
     </>
   )
 }
diff --git a/packages/create/src/frameworks/react/add-ons/clerk/assets/src/integrations/clerk/provider.tsx b/packages/create/src/frameworks/react/add-ons/clerk/assets/src/integrations/clerk/provider.tsx
index 3dbbbf1c..c6b75516 100644
--- a/packages/create/src/frameworks/react/add-ons/clerk/assets/src/integrations/clerk/provider.tsx
+++ b/packages/create/src/frameworks/react/add-ons/clerk/assets/src/integrations/clerk/provider.tsx
@@ -1,4 +1,4 @@
-import { ClerkProvider } from '@clerk/clerk-react'
+import { ClerkProvider } from '@clerk/tanstack-react-start'
 
 const PUBLISHABLE_KEY = import.meta.env.VITE_CLERK_PUBLISHABLE_KEY
 if (!PUBLISHABLE_KEY) {
diff --git a/packages/create/src/frameworks/react/add-ons/clerk/assets/src/routes/demo/clerk.tsx b/packages/create/src/frameworks/react/add-ons/clerk/assets/src/routes/demo/clerk.tsx
index 14676584..b7b3ed6b 100644
--- a/packages/create/src/frameworks/react/add-ons/clerk/assets/src/routes/demo/clerk.tsx
+++ b/packages/create/src/frameworks/react/add-ons/clerk/assets/src/routes/demo/clerk.tsx
@@ -1,5 +1,5 @@
+import { useUser } from '@clerk/tanstack-react-start'
 import { createFileRoute } from '@tanstack/react-router'
-import { useUser } from '@clerk/clerk-react'
 
 export const Route = createFileRoute('/demo/clerk')({
   component: App,
diff --git a/packages/create/src/frameworks/react/add-ons/clerk/assets/src/start.ts b/packages/create/src/frameworks/react/add-ons/clerk/assets/src/start.ts
new file mode 100644
index 00000000..7447718f
--- /dev/null
+++ b/packages/create/src/frameworks/react/add-ons/clerk/assets/src/start.ts
@@ -0,0 +1,8 @@
+import { clerkMiddleware } from '@clerk/tanstack-react-start/server'
+import { createStart } from '@tanstack/react-start'
+
+export const startInstance = createStart(() => {
+  return {
+    requestMiddleware: [clerkMiddleware()],
+  }
+})
diff --git a/packages/create/src/frameworks/react/add-ons/clerk/info.json b/packages/create/src/frameworks/react/add-ons/clerk/info.json
index 3d1143bb..ac13da53 100644
--- a/packages/create/src/frameworks/react/add-ons/clerk/info.json
+++ b/packages/create/src/frameworks/react/add-ons/clerk/info.json
@@ -36,6 +36,18 @@
       "required": true,
       "secret": false,
       "file": ".env.local"
+    },
+    {
+      "name": "CLERK_SECRET_KEY",
+      "description": "Clerk secret key",
+      "required": true,
+      "secret": true,
+      "file": ".env.local"
+    }
+  ],
+  "packageAdditions": {
+    "dependencies": {
+      "@clerk/tanstack-react-start": "^1.0.4"
     }
-  ]
+  }
 }
diff --git a/packages/create/src/frameworks/react/add-ons/clerk/package.json b/packages/create/src/frameworks/react/add-ons/clerk/package.json
index a3be4657..9178d1a3 100644
--- a/packages/create/src/frameworks/react/add-ons/clerk/package.json
+++ b/packages/create/src/frameworks/react/add-ons/clerk/package.json
@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "@clerk/clerk-react": "^5.61.3"
+    "@clerk/tanstack-react-start": "^1.0.4"
   }
 }