diff --git a/apps/studio/compat/next/dynamic.tsx b/apps/studio/compat/next/dynamic.tsx
index 47134022b9b..9b026b10c7a 100644
--- a/apps/studio/compat/next/dynamic.tsx
+++ b/apps/studio/compat/next/dynamic.tsx
@@ -25,6 +25,7 @@ function isDefaultExport<P>(
 }
 
  
+// eslint-disable-next-line no-restricted-exports
 export default function dynamic<P extends object = {}>(
   loader: Loader<P>,
   options: DynamicOptions = {}
diff --git a/apps/studio/compat/next/head.tsx b/apps/studio/compat/next/head.tsx
index 4724a4511df..b5e79e6e73a 100644
--- a/apps/studio/compat/next/head.tsx
+++ b/apps/studio/compat/next/head.tsx
@@ -25,6 +25,7 @@ import type { ReactNode } from 'react'
 //     We have no such consumers today; if one shows up, swap to a
 //     portal+SSR-collector setup.
 
+// eslint-disable-next-line no-restricted-exports
 export default function Head({ children }: { children?: ReactNode }) {
   return <>{children}</>
 }
diff --git a/apps/studio/compat/next/image.tsx b/apps/studio/compat/next/image.tsx
index 2736c35a099..1f27dbc4744 100644
--- a/apps/studio/compat/next/image.tsx
+++ b/apps/studio/compat/next/image.tsx
@@ -144,4 +144,5 @@ const Image = forwardRef(function Image(
   )
 })
 
+// eslint-disable-next-line no-restricted-exports
 export default Image
diff --git a/apps/studio/compat/next/legacy/image.tsx b/apps/studio/compat/next/legacy/image.tsx
index faa579427f6..df270630aa1 100644
--- a/apps/studio/compat/next/legacy/image.tsx
+++ b/apps/studio/compat/next/legacy/image.tsx
@@ -140,4 +140,5 @@ const Image = forwardRef(function Image(
   )
 })
 
+// eslint-disable-next-line no-restricted-exports
 export default Image
diff --git a/apps/studio/compat/next/link.tsx b/apps/studio/compat/next/link.tsx
index 0f1e8e7e5af..c481bad49c9 100644
--- a/apps/studio/compat/next/link.tsx
+++ b/apps/studio/compat/next/link.tsx
@@ -246,4 +246,5 @@ const Link = forwardRef(function Link(
   )
 })
 
+// eslint-disable-next-line no-restricted-exports
 export default Link
diff --git a/apps/studio/compat/next/router.ts b/apps/studio/compat/next/router.ts
index 07b38781cf9..1608660bc43 100644
--- a/apps/studio/compat/next/router.ts
+++ b/apps/studio/compat/next/router.ts
@@ -261,4 +261,5 @@ const singletonRouter = {
   },
 }
 
+// eslint-disable-next-line no-restricted-exports
 export default singletonRouter
diff --git a/apps/studio/compat/next/script.tsx b/apps/studio/compat/next/script.tsx
index bab5cb96f16..cd844cd0547 100644
--- a/apps/studio/compat/next/script.tsx
+++ b/apps/studio/compat/next/script.tsx
@@ -20,6 +20,7 @@ interface ScriptProps extends Omit<ComponentPropsWithoutRef<'script'>, 'children
   onError?: (e: Event | string) => void
 }
 
+// eslint-disable-next-line no-restricted-exports
 export default function Script({
   strategy: _strategy,
   children,
diff --git a/apps/studio/routes/__root.tsx b/apps/studio/routes/__root.tsx
index f730d2ecb90..6d6ebdc5901 100644
--- a/apps/studio/routes/__root.tsx
+++ b/apps/studio/routes/__root.tsx
@@ -242,7 +242,7 @@ const errorBoundaryHandler = (error: Error, info: ErrorInfo) => {
     const eventId = Sentry.captureException(error)
     // Attach the Sentry event ID to the error object so it can be accessed by the error boundary
     if (eventId && error && typeof error === 'object') {
-      ;(error as any).sentryId = eventId
+      ;(error as Error & { sentryId?: string }).sentryId = eventId
     }
   })
 
@@ -263,7 +263,7 @@ function ErrorBoundaryRoute({ error }: { error: Error }) {
       scope.setTag('routerErrorComponent', true)
       const eventId = Sentry.captureException(error)
       if (eventId && error && typeof error === 'object') {
-        ;(error as any).sentryId = eventId
+        ;(error as Error & { sentryId?: string }).sentryId = eventId
       }
     })
     console.error(error.stack)
diff --git a/apps/studio/turbo.jsonc b/apps/studio/turbo.jsonc
index 4318f9c4c21..b91eba67d96 100644
--- a/apps/studio/turbo.jsonc
+++ b/apps/studio/turbo.jsonc
@@ -109,6 +109,9 @@
         // Declared here so the studio-package turbo env lint rule passes
         // even though turbo doesn't directly drive `start`.
         "PORT",
+        // Gates the TanStack vs Next path in api/server.js, vercel.ts,
+        // and scripts/dispatch.js (the dev/build/start dispatcher).
+        "STUDIO_FRAMEWORK",
       ],
       "passThroughEnv": [
         "CURRENT_CLI_VERSION",