diff --git a/apps/next-app-router/app/Variant.tsx b/apps/next-app-router/app/Variant.tsx
index 2637fad1..847d39c8 100644
--- a/apps/next-app-router/app/Variant.tsx
+++ b/apps/next-app-router/app/Variant.tsx
@@ -1,13 +1,12 @@
-import dynamic from 'next/dynamic'
+import { lazy } from 'react'
 
-const DefaultVariant = dynamic(() => import('./variants/default'))
-const GroqStoreVariant = dynamic(() => import('./variants/groq-store'))
-const LiveStoreVariant = dynamic(() => import('./variants/live-store'))
+const GroqStoreVariant = lazy(() => import('./variants/groq-store'))
+const LiveStoreVariant = lazy(() => import('./variants/live-store'))
 
 export default function Variant(props: React.PropsWithChildren) {
   switch (process.env.VARIANT || 'default') {
     case 'default':
-      return <DefaultVariant {...props} />
+      return <>{props.children}</>
     case 'groq-store':
       return <GroqStoreVariant {...props} />
     case 'live-store':
diff --git a/apps/next-app-router/app/layout.tsx b/apps/next-app-router/app/layout.tsx
index f46d8e6d..5aa61589 100644
--- a/apps/next-app-router/app/layout.tsx
+++ b/apps/next-app-router/app/layout.tsx
@@ -4,6 +4,8 @@ import { unstable__adapter, unstable__environment } from '@sanity/client'
 import DraftModeButton from './DraftModeButton'
 import type { Metadata } from 'next'
 
+export const runtime = 'edge'
+
 export const metadata: Metadata = {
   title: `next-app-router-${process.env.VARIANT || 'default'}`,
 }
diff --git a/apps/next-app-router/app/page.tsx b/apps/next-app-router/app/page.tsx
index 48128cfc..fd4cccdd 100644
--- a/apps/next-app-router/app/page.tsx
+++ b/apps/next-app-router/app/page.tsx
@@ -16,6 +16,8 @@ import Variant from './Variant'
 import { PreviewTable, PreviewFooter } from './previews'
 import { Suspense } from 'react'
 
+export const runtime = 'edge'
+
 export default async function Page() {
   const footer = await sanityFetch<FooterProps['data']>({
     query: footerQuery,
@@ -32,6 +34,7 @@ export default async function Page() {
         initialData={footer}
         query={footerQuery}
         as={PreviewFooter}
+        throwOnMissingProvider={false}
       >
         <Footer data={footer} />
       </LiveQuery>
@@ -53,6 +56,7 @@ async function ServerTable() {
       initialData={data}
       query={tableQuery}
       as={PreviewTable}
+      throwOnMissingProvider={false}
     >
       <Table data={data} />
     </LiveQuery>
diff --git a/apps/next-app-router/app/variants/default/index.tsx b/apps/next-app-router/app/variants/default/index.tsx
deleted file mode 100644
index 83dcab52..00000000
--- a/apps/next-app-router/app/variants/default/index.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function DefaultVariant({ children }: React.PropsWithChildren) {
-  return children
-}
diff --git a/apps/next-app-router/app/variants/groq-store/PreviewProvider.tsx b/apps/next-app-router/app/variants/groq-store/PreviewProvider.tsx
index 357ca2a6..16e9e3d0 100644
--- a/apps/next-app-router/app/variants/groq-store/PreviewProvider.tsx
+++ b/apps/next-app-router/app/variants/groq-store/PreviewProvider.tsx
@@ -16,12 +16,7 @@ export default function PreviewProvider({
   const { client } = suspend(() => import('./sanity.client'), [UniqueKey])
   if (!token) throw new TypeError('Missing token')
   return (
-    <LiveQueryProvider
-      client={client}
-      token={token}
-      logger={console}
-      cache={{ includeTypes: ['page'] }}
-    >
+    <LiveQueryProvider client={client} token={token} logger={console}>
       {children}
     </LiveQueryProvider>
   )
diff --git a/apps/next-app-router/next.config.mjs b/apps/next-app-router/next.config.mjs
index 8079aeb8..6b933204 100644
--- a/apps/next-app-router/next.config.mjs
+++ b/apps/next-app-router/next.config.mjs
@@ -7,6 +7,7 @@ const nextConfig = {
       fullUrl: true,
     },
   },
+  reactStrictMode: true,
   serverActions: true,
   productionBrowserSourceMaps: true,
   // Support Vercel Authentication protection
@@ -21,7 +22,7 @@ const nextConfig = {
           },
           {
             key: 'Content-Security-Policy',
-            value: `frame-ancestors 'self' https://*.sanity.build`,
+            value: `frame-ancestors 'self' https://*.sanity.build http://localhost:3333`,
           },
         ],
       },
diff --git a/apps/next-pages-router/next.config.mjs b/apps/next-pages-router/next.config.mjs
index 1d08ba0b..123dd3e5 100644
--- a/apps/next-pages-router/next.config.mjs
+++ b/apps/next-pages-router/next.config.mjs
@@ -7,6 +7,7 @@ const nextConfig = {
       fullUrl: true,
     },
   },
+  reactStrictMode: true,
   productionBrowserSourceMaps: true,
   // Support Vercel Authentication protection
   async headers() {
@@ -20,7 +21,7 @@ const nextConfig = {
           },
           {
             key: 'Content-Security-Policy',
-            value: `frame-ancestors 'self' https://*.sanity.build`,
+            value: `frame-ancestors 'self' https://*.sanity.build http://localhost:3333`,
           },
         ],
       },
diff --git a/apps/next-pages-router/src/pages/index.tsx b/apps/next-pages-router/src/pages/index.tsx
index c4a39387..85e5b5b8 100644
--- a/apps/next-pages-router/src/pages/index.tsx
+++ b/apps/next-pages-router/src/pages/index.tsx
@@ -18,7 +18,7 @@ import {
   tableQuery,
 } from 'ui/react'
 import dynamic from 'next/dynamic'
-import { useIsEnabled } from '@sanity/preview-kit'
+import { useIsEnabled, useLiveQuery } from '@sanity/preview-kit'
 import { LiveQuery } from '@sanity/preview-kit/live-query'
 import { sanityFetch, token } from '../sanity.fetch'
 
@@ -82,6 +82,8 @@ export default function Page(
       client__environment: environment,
     })
   }, [])
+  const [table, , isLive] = useLiveQuery(props.table, tableQuery)
+  const [footer] = useLiveQuery(props.footer, footerQuery)
 
   return (
     <Container>
@@ -93,22 +95,10 @@ export default function Page(
         )}
       </form>
       <Variant {...props}>
-        <LiveQuery
-          enabled={draftMode}
-          initialData={props.table}
-          query={tableQuery}
-        >
-          <Table data={props.table} />
-        </LiveQuery>
-        <LiveQuery
-          enabled={draftMode}
-          initialData={props.footer}
-          query={footerQuery}
-        >
-          <Footer data={props.footer} />
-        </LiveQuery>
+        <Table data={table} />
+        <Footer data={footer} />
         {timestamp && <Timestamp date={timestamp} />}
-        <RefreshButton />
+        <RefreshButton isLive={isLive} />
       </Variant>
       <script
         type="application/json"
@@ -120,8 +110,7 @@ export default function Page(
   )
 }
 
-function RefreshButton() {
-  const isLive = useIsEnabled()
+function RefreshButton({ isLive }: { isLive: boolean }) {
   return (
     <form
       action="/api/revalidate"
diff --git a/apps/remix/app/routes/index.tsx b/apps/remix/app/routes/index.tsx
index 92010f4d..ca35fba6 100644
--- a/apps/remix/app/routes/index.tsx
+++ b/apps/remix/app/routes/index.tsx
@@ -92,6 +92,7 @@ export default function Index() {
           enabled={previewDrafts}
           initialData={table}
           query={tableQuery}
+          throwOnMissingProvider={false}
         >
           <Table data={table} />
         </LiveQuery>
@@ -99,6 +100,7 @@ export default function Index() {
           enabled={previewDrafts}
           initialData={footer}
           query={footerQuery}
+          throwOnMissingProvider={false}
         >
           <Footer data={footer} />
         </LiveQuery>
diff --git a/apps/remix/app/variants/live-store/index.tsx b/apps/remix/app/variants/live-store/index.tsx
index 26bb2fd3..421d2649 100644
--- a/apps/remix/app/variants/live-store/index.tsx
+++ b/apps/remix/app/variants/live-store/index.tsx
@@ -1,5 +1,5 @@
 import type { SerializeFrom } from '@vercel/remix'
-import { lazy } from 'react'
+import { StrictMode, lazy } from 'react'
 
 import type { loader } from '~/routes'
 
@@ -12,9 +12,11 @@ export default function LiveStoreVariant({
   studioUrl,
 }: SerializeFrom<typeof loader> & React.PropsWithChildren) {
   return previewDrafts ? (
-    <PreviewProvider token={token!} studioUrl={studioUrl}>
-      {children}
-    </PreviewProvider>
+    <StrictMode>
+      <PreviewProvider token={token!} studioUrl={studioUrl}>
+        {children}
+      </PreviewProvider>
+    </StrictMode>
   ) : (
     children
   )
diff --git a/packages/preview-kit/.gitignore b/packages/preview-kit/.gitignore
deleted file mode 100644
index dd9d8c55..00000000
--- a/packages/preview-kit/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-client.js
-csm.js
-live-query.js
-react-server/**/*.d.ts
diff --git a/packages/preview-kit/README.md b/packages/preview-kit/README.md
index a0ae9625..93914a00 100644
--- a/packages/preview-kit/README.md
+++ b/packages/preview-kit/README.md
@@ -17,7 +17,6 @@
     - [Advanced usage](#advanced-usage)
       - [Using the `LiveQuery` wrapper component instead of the `useLiveQuery` hook](#using-the-livequery-wrapper-component-instead-of-the-uselivequery-hook)
       - [Trouble-shooting and debugging](#trouble-shooting-and-debugging)
-      - [Fine-tuning `cache`](#fine-tuning-cache)
       - [Content Source Map features](#content-source-map-features)
 - [`@sanity/preview-kit/client`](#sanitypreview-kitclient)
   - [Visual Editing with Content Source Maps](#visual-editing-with-content-source-maps)
@@ -656,62 +655,8 @@ If it's always `false` it's an indicator that you may need to lift your `LiveQue
 - Next App Router: `src/app/layout.tsx`
 - Next Pages Router: `src/pages/_app.tsx`
 
-#### Fine-tuning `cache`
-
-The defaults set for the `cache` prop are optimized for most use cases, but are conservative since the size of your documents can vary a lot. And your queries might only use some document types and it's not necessary to cache every type.
-Thus you can fine-tune the cache by passing a custom `cache` prop to `LiveQueryProvider`:
-
-```tsx
-import { LiveQueryProvider } from '@sanity/preview-kit'
-
-return (
-  <LiveQueryProvider
-    client={client}
-    token={token}
-    cache={{
-      // default: 3000, increased to 10000 for this example app as each document is small
-      maxDocuments: 10000,
-      // The default cache includes all document types, you can reduce the amount of documents
-      // by only including the ones you need.
-      // You can run the `array::unique(*._type)` GROQ query in `Vision` in your Studio to see how many types are in your dataset.
-      // Just be careful that you don't forget the document types you might be using in strong references, such as `project` or `sanity.imageAsset`
-      includeTypes: ['page', 'product', 'sanity.imageAsset'],
-      // Turn off using a mutation EventSource listener, this means content updates will require a manual refresh
-      listen: false,
-    }}
-    // If the cache is full it'll fallback to a polling interval mode, that refreshes every 10 seconds by default.
-    // You can opt-in to having an error thrown instead by setting this to `0`.
-    refreshInterval={10000}
-    // Passing a logger gives you more information on what to expect based on your configuration
-    logger={console}
-  >
-    {children}
-  </LiveQueryProvider>
-)
-```
-
 #### Content Source Map features
 
-When the `client` instance is configured to `client.config().resultSourceMap == true` the `LiveQueryProvider` will opt-in to a faster and smarter cache than the default mode.
-It'll only listen for mutations on the documents that you are using in your queries, and apply the mutations to the cache in real-time.
-This mode is best-effort, and if you're relying on features such as `upper` you may want to disable this mode.
-
-```tsx
-import { LiveQueryProvider } from '@sanity/preview-kit'
-
-return (
-  <LiveQueryProvider
-    client={client}
-    token={token}
-    turboSourceMap={false}
-    // Passing a logger gives you more information on what to expect based on your configuration
-    logger={console}
-  >
-    {children}
-  </LiveQueryProvider>
-)
-```
-
 For data that can't be traced with Content Source Maps there's a background refresh interval. Depending on your queries you might want to tweak this interval to get the best performance.
 
 ```tsx
diff --git a/packages/preview-kit/package.config.ts b/packages/preview-kit/package.config.ts
index 8ba55c27..8bb9511b 100644
--- a/packages/preview-kit/package.config.ts
+++ b/packages/preview-kit/package.config.ts
@@ -1,23 +1,52 @@
+import terser from '@rollup/plugin-terser'
 import { defineConfig } from '@sanity/pkg-utils'
 
+const MODULE_PATHES_WHICH_USE_CLIENT_DIRECTIVE_SHOULD_BE_ADDED = [
+  'LiveQueryClientComponent.tsx',
+]
+
 export default defineConfig({
   tsconfig: 'tsconfig.build.json',
-  legacyExports: true,
-  bundles: [
-    {
-      source: './src/_exports/internals/_create-conditional-live-query.ts',
-      import: './dist/internals/create-conditional-live-query.js',
-      runtime: 'node',
-    },
-    {
-      source: './src/_exports/internals/_live-query.ts',
-      import: './dist/internals/live-query.js',
-      runtime: 'node',
+  // Overriding the minify logiic in order to disable `compress: {directives: false}`
+  minify: false,
+  rollup: {
+    plugins: [
+      terser({
+        compress: { directives: false },
+        output: {
+          comments: (_node, comment) => {
+            const text = comment.value
+            const type = comment.type
+
+            // Check if this is a multiline comment
+            if (type == 'comment2') {
+              // Keep licensing comments
+              return /@preserve|@license|@cc_on/i.test(text)
+            }
+
+            return false
+          },
+        },
+      }),
+    ],
+    output: {
+      preserveModules: true,
+      preserveModulesRoot: 'src',
+      banner: (chunkInfo) => {
+        if (
+          MODULE_PATHES_WHICH_USE_CLIENT_DIRECTIVE_SHOULD_BE_ADDED.find(
+            (modulePath) => chunkInfo.facadeModuleId?.endsWith(modulePath),
+          )
+        ) {
+          return `"use client"`
+        }
+        return ''
+      },
     },
-  ],
+  },
   extract: {
     rules: {
-      'ae-forgotten-export': 'warn',
+      'ae-forgotten-export': 'error',
       'ae-incompatible-release-tags': 'warn',
       'ae-internal-missing-underscore': 'off',
       'ae-missing-release-tag': 'warn',
diff --git a/packages/preview-kit/package.json b/packages/preview-kit/package.json
index 1c56c9bd..5896ffe7 100644
--- a/packages/preview-kit/package.json
+++ b/packages/preview-kit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sanity/preview-kit",
-  "version": "4.0.2",
+  "version": "4.0.3-canary.2",
   "description": "General purpose utils for live content and visual editing",
   "keywords": [
     "groq",
@@ -29,7 +29,7 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "source": "./src/_exports/index.ts",
+      "source": "./src/index.ts",
       "require": "./dist/index.cjs",
       "node": {
         "module": "./dist/index.js",
@@ -39,54 +39,48 @@
       "default": "./dist/index.js"
     },
     "./client": {
-      "types": "./dist/client.d.ts",
-      "source": "./src/_exports/client.ts",
-      "require": "./dist/client.cjs",
+      "types": "./dist/client/index.d.ts",
+      "source": "./src/client/index.ts",
+      "require": "./dist/client/index.cjs",
       "node": {
-        "module": "./dist/client.js",
-        "import": "./dist/client.cjs.js"
+        "module": "./dist/client/index.js",
+        "import": "./dist/client/index.cjs.js"
       },
-      "import": "./dist/client.js",
-      "default": "./dist/client.js"
+      "import": "./dist/client/index.js",
+      "default": "./dist/client/index.js"
     },
     "./live-query": {
-      "types": "./dist/live-query.d.ts",
-      "source": "./src/_exports/live-query.ts",
-      "react-server": "./react-server/live-query/index.js",
-      "require": "./dist/live-query.cjs",
+      "types": "./dist/live-query/index.d.ts",
+      "source": "./src/live-query/index.ts",
+      "require": "./dist/live-query/index.cjs",
       "node": {
-        "module": "./dist/live-query.js",
-        "import": "./dist/live-query.cjs.js"
+        "module": "./dist/live-query/index.js",
+        "import": "./dist/live-query/index.cjs.js"
       },
-      "import": "./dist/live-query.js",
-      "default": "./dist/live-query.js"
+      "import": "./dist/live-query/index.js",
+      "default": "./dist/live-query/index.js"
     },
     "./package.json": "./package.json"
   },
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
-  "source": "./src/_exports/index.ts",
+  "source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "typesVersions": {
     "*": {
       "client": [
-        "./dist/client.d.ts"
+        "./dist/client/index.d.ts"
       ],
       "live-query": [
-        "./dist/live-query.d.ts"
+        "./dist/live-query/index.d.ts"
       ]
     }
   },
   "files": [
-    "dist",
-    "react-server",
-    "!react-server/**/*.d.ts",
-    "client.js",
-    "csm.js",
-    "live-query.js"
+    "dist"
   ],
   "scripts": {
-    "prebuild": "rimraf coverage dist client.js csm.js live-query.js || true",
+    "prebuild": "rimraf coverage dist || true",
     "build": "pkg build --strict && pkg --strict",
     "watch": "pnpm build watch",
     "coverage": "vitest run --coverage",
@@ -106,8 +100,6 @@
     "singleQuote": true
   },
   "dependencies": {
-    "@sanity/eventsource": "5.0.1",
-    "@sanity/groq-store": "4.1.3",
     "@sanity/preview-kit-compat": "1.0.1",
     "@vercel/stega": "0.1.0",
     "lru-cache": "10.1.0",
@@ -116,8 +108,9 @@
     "use-sync-external-store": "1.2.0"
   },
   "devDependencies": {
+    "@rollup/plugin-terser": "^0.4.4",
     "@sanity/client": "^6.9.1",
-    "@sanity/pkg-utils": "^3.2.5",
+    "@sanity/pkg-utils": "3.2.6-canary.0",
     "@sanity/semantic-release-preset": "^4.1.6",
     "@types/node": "^18.18.6",
     "@types/react": "^18.2.39",
diff --git a/packages/preview-kit/react-server/live-query/index.client.js b/packages/preview-kit/react-server/live-query/index.client.js
deleted file mode 100644
index 490f377e..00000000
--- a/packages/preview-kit/react-server/live-query/index.client.js
+++ /dev/null
@@ -1,3 +0,0 @@
-'use client'
-
-export { default } from '../../dist/internals/live-query.js'
diff --git a/packages/preview-kit/react-server/live-query/index.js b/packages/preview-kit/react-server/live-query/index.js
deleted file mode 100644
index 5a683b11..00000000
--- a/packages/preview-kit/react-server/live-query/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { lazy } from 'react'
-
-import { createConditionalLiveQuery } from '../../dist/internals/create-conditional-live-query.js'
-
-const ClientComponent = lazy(() => import('./index.client.js'))
-
-export const LiveQuery = createConditionalLiveQuery({ ClientComponent })
-export default LiveQuery
diff --git a/packages/preview-kit/src/GroqStoreProvider/GroqStoreProvider.tsx b/packages/preview-kit/src/GroqStoreProvider/GroqStoreProvider.tsx
deleted file mode 100644
index 96fe9c87..00000000
--- a/packages/preview-kit/src/GroqStoreProvider/GroqStoreProvider.tsx
+++ /dev/null
@@ -1,200 +0,0 @@
-import type { QueryParams } from '@sanity/client'
-import DefaultEventSource from '@sanity/eventsource'
-import { type Config, groqStore } from '@sanity/groq-store'
-import { memo, useEffect, useMemo, useState } from 'react'
-
-import {
-  defineListenerContext as ListenerContext,
-  IsEnabledContext,
-  LoadedListenersContext,
-} from '../context'
-import type {
-  DefineListenerContext,
-  ListenerGetSnapshot,
-  ListenerSubscribe,
-  LiveQueryProviderProps,
-  Logger,
-} from '../types'
-import {
-  DEFAULT_MAX_DOCUMENTS,
-  getQueryCacheKey,
-  type QueryCacheKey,
-  useLoadingListenersContext,
-} from '../utils'
-
-export type { LiveQueryProviderProps, Logger }
-export type { CacheOptions } from '../types'
-
-/**
- * @public
- */
-export interface GroqStoreProviderInternalProps extends Config {
-  children: React.ReactNode
-  /**
-   * @defaultValue true
-   */
-  listen?: boolean
-  /**
-   * @defaultValue true
-   */
-  overlayDrafts?: boolean
-  /**
-   * @defaultValue 3000
-   */
-  documentLimit?: number
-  logger?: Logger
-}
-/**
- * Caches the store instance, if the config changes you need to pass a new `key` prop to apply it and trigger a re-render
- * @public
- */
-const GroqStoreProviderInternal = memo(function GroqStoreProvider(
-  props: GroqStoreProviderInternalProps,
-) {
-  const {
-    children,
-    logger,
-    // The rest is the store config
-    ...config
-  } = props
-
-  const [ready] = useState(() => new Set<QueryCacheKey>())
-  const [loadedListenersContext, updateLoadedListeners] =
-    useLoadingListenersContext(ready)
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const [snapshots] = useState(() => new Map<QueryCacheKey, any>())
-  const [store] = useState(() =>
-    groqStore({
-      // Override some of the store defaults
-      EventSource: props.token ? DefaultEventSource : undefined,
-      listen: true,
-      overlayDrafts: true,
-      documentLimit: DEFAULT_MAX_DOCUMENTS,
-      subscriptionThrottleMs: 1,
-      // Spread in the rest
-      ...config,
-    }),
-  )
-
-  const report = useMemo(() => {
-    if (config.listen) {
-      return `Updates are applied in real-time. The cache is set to max ${
-        config.documentLimit || DEFAULT_MAX_DOCUMENTS
-      } documents.`
-    }
-    return `Updates require a manual refresh. The cache is set to max ${
-      config.documentLimit || DEFAULT_MAX_DOCUMENTS
-    } documents.`
-  }, [config.documentLimit, config.listen])
-  useEffect(() => {
-    if (logger) {
-      logger.log(
-        `[@sanity/preview-kit]: With the current configuration you can expect that: ${report}`,
-      )
-    }
-  }, [logger, report])
-
-  // Make sure any async errors bubble up to the nearest error boundary
-  const [error, setError] = useState<unknown>(null)
-  // eslint-disable-next-line no-warning-comments
-  // @TODO can we just re throw inside the subscription itself?
-  if (error) throw error
-
-  const [listenerContext] = useState<DefineListenerContext>(() => {
-    return function defineListener<QueryResult>(
-      initialSnapshot: QueryResult,
-      query: string,
-      params: QueryParams,
-    ) {
-      const key = getQueryCacheKey(query, params)
-
-      // groq-store returns on subscriptions when the dataset haven't finished loading yet.
-      // We workaround this by setting the initial value as the one provided by the hook
-      if (!snapshots.has(key)) {
-        snapshots.set(key, initialSnapshot)
-      }
-
-      const subscribe: ListenerSubscribe = (onStoreChange) => {
-        if (!ready.has(key)) {
-          store.query(query, params).then((result) => {
-            if (!ready.has(key)) {
-              snapshots.set(key, result)
-
-              ready.add(key)
-              updateLoadedListeners()
-
-              onStoreChange()
-            }
-          }, setError)
-        }
-
-        if (!config.listen) {
-          // eslint-disable-next-line @typescript-eslint/no-empty-function
-          return () => {}
-        }
-
-        const subscription = store.subscribe(query, params, (err, result) => {
-          if (err) {
-            setError(err)
-            // Hold off on calling `onStoreChange` until we have a snapshot
-          } else if (ready.has(key)) {
-            snapshots.set(key, result)
-            onStoreChange()
-          }
-        })
-        return () => subscription.unsubscribe()
-      }
-      const getSnapshot: ListenerGetSnapshot<QueryResult> = () =>
-        snapshots.get(key)
-
-      return { subscribe, getSnapshot }
-    } satisfies DefineListenerContext
-  })
-
-  return (
-    <ListenerContext.Provider value={listenerContext}>
-      <LoadedListenersContext.Provider value={loadedListenersContext}>
-        <IsEnabledContext.Provider value>{children}</IsEnabledContext.Provider>
-      </LoadedListenersContext.Provider>
-    </ListenerContext.Provider>
-  )
-})
-
-/**
- * Handles live query updates using `@sanity/groq-store`
- * @internal
- */
-const GroqStoreProvider = memo(function GroqStoreProvider(
-  props: LiveQueryProviderProps,
-) {
-  const { children, client, cache, logger } = props
-  const {
-    projectId,
-    dataset,
-    token,
-    // eslint-disable-next-line no-warning-comments
-    // @TODO @sanity/groq-store should handle `perspective` directly
-    perspective = 'previewDrafts',
-    requestTagPrefix,
-  } = useMemo(() => client.config(), [client])
-
-  return (
-    <GroqStoreProviderInternal
-      projectId={projectId!}
-      dataset={dataset!}
-      token={token}
-      logger={logger}
-      listen={cache?.listen ?? true}
-      documentLimit={cache?.maxDocuments}
-      overlayDrafts={perspective === 'previewDrafts'}
-      includeTypes={cache?.includeTypes}
-      requestTagPrefix={requestTagPrefix}
-    >
-      {children}
-    </GroqStoreProviderInternal>
-  )
-})
-GroqStoreProvider.displayName = 'GroqStoreProvider'
-
-export default GroqStoreProvider
diff --git a/packages/preview-kit/src/GroqStoreProvider/index.ts b/packages/preview-kit/src/GroqStoreProvider/index.ts
deleted file mode 100644
index 898595d6..00000000
--- a/packages/preview-kit/src/GroqStoreProvider/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './GroqStoreProvider'
-export { default } from './GroqStoreProvider'
diff --git a/packages/preview-kit/src/LiveQuery/LiveQueryClientComponent.tsx b/packages/preview-kit/src/LiveQuery/LiveQueryClientComponent.tsx
deleted file mode 100644
index d7472326..00000000
--- a/packages/preview-kit/src/LiveQuery/LiveQueryClientComponent.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import type { QueryParams as ClientQueryParams } from '@sanity/client'
-import type { PropsWithChildren } from 'react'
-import { Children, cloneElement, isValidElement } from 'react'
-
-import { useLiveQuery } from './useLiveQuery'
-
-export type { ClientQueryParams }
-
-/** @public */
-export type LiveQueryClientComponentProps<QueryResult, QueryParams> =
-  PropsWithChildren<{
-    initialData: QueryResult
-    query: string
-    params?: QueryParams | undefined
-  }>
-
-// Browser-only preview component, overwrites the data prop with live data on-demand
-export default function LiveQueryClientComponent<
-  QueryResult,
-  QueryParams extends ClientQueryParams = ClientQueryParams,
->(
-  props: LiveQueryClientComponentProps<QueryResult, QueryParams>,
-): React.JSX.Element {
-  const { initialData, query, params, children } = props
-  const data = useLiveQuery<QueryResult, QueryParams>(
-    initialData,
-    query,
-    params,
-  )
-
-  return <Slot data={data}>{children}</Slot>
-}
-LiveQueryClientComponent.displayName = 'LiveQuery'
-
-/**
- * Original source for `Slot` is `@radix-ui/react-slot`: https://github.com/radix-ui/primitives/blob/3e0642e40038386d58da9fb1d812c2fbfe9f67c1/packages/react/slot/src/Slot.tsx
- * It's copied and modified here as the original doesn't override the props on children, which would require us to use this pattern:
- * ```<LiveQuery initialData={data}><Posts /></LiveQuery>```
- * However, we want to use this pattern as it preserves the same type safety as before live queries are added:
- * ```<LiveQuery initialData={data}><Posts data={data} /></LiveQuery>```
- *
- * It also made sense to modify the original as our use case is smaller than radix, for example we don't have to worry about merging `style` props
- */
-
-interface SlotProps {
-  children: React.ReactNode
-  // eslint-disable-next-line no-warning-comments
-  // @TODO support better typings
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  data: any
-}
-
-const Slot = (props: SlotProps) => {
-  const { children, data, ...slotProps } = props
-
-  if (isValidElement(children)) {
-    return cloneElement(children, {
-      ...slotProps,
-      ...children.props,
-      // all child props should override, except for `data`
-      data,
-      // eslint-disable-next-line no-warning-comments
-      // @ts-expect-error -- @todo fix the typings
-      ref: children.ref,
-    })
-  }
-
-  return Children.count(children) > 1 ? Children.only(null) : null
-}
-Slot.displayName = 'Slot'
diff --git a/packages/preview-kit/src/LiveQuery/createConditionalLiveQuery.tsx b/packages/preview-kit/src/LiveQuery/createConditionalLiveQuery.tsx
deleted file mode 100644
index c9878f38..00000000
--- a/packages/preview-kit/src/LiveQuery/createConditionalLiveQuery.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-import type { QueryParams as ClientQueryParams } from '@sanity/client'
-import { Children, isValidElement } from 'react'
-
-import type { LiveQueryClientComponentProps } from './LiveQueryClientComponent'
-
-export type { ClientQueryParams, LiveQueryClientComponentProps }
-
-/** @public */
-export interface LiveQueryProps<
-  QueryResult,
-  QueryParams extends ClientQueryParams = ClientQueryParams,
-> extends LiveQueryClientComponentProps<QueryResult, QueryParams> {
-  enabled: boolean
-  // eslint-disable-next-line no-warning-comments
-  // @TODO fix typing of this
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  as?: React.ComponentType<any>
-}
-
-const DEFAULT_PARAMS = {} as ClientQueryParams
-
-/**
- * @internal
- */
-export function createConditionalLiveQuery<
-  QueryResult,
-  QueryParams extends ClientQueryParams = ClientQueryParams,
->(options: {
-  ClientComponent: React.ComponentType<
-    LiveQueryClientComponentProps<QueryResult, QueryParams>
-  >
-}): React.ComponentType<LiveQueryProps<QueryResult, QueryParams>> {
-  const { ClientComponent } = options
-
-  function ConditionalLiveQuery<
-    QueryResult,
-    QueryParams extends ClientQueryParams = ClientQueryParams,
-  >(props: LiveQueryProps<QueryResult, QueryParams>): React.ReactNode {
-    // Always passthrough when not enabled
-    if (!props.enabled) {
-      return props.children
-    }
-
-    const {
-      query,
-      params = DEFAULT_PARAMS,
-      initialData,
-      as: LiveComponent,
-    } = props
-    // If we have an `as` prop it means we're likely working around a `children` that is RSC, and the `as` prop provides a Client Component
-    if (LiveComponent) {
-      if (Children.count(props.children) > 1) {
-        throw new Error(
-          'LiveQuery: `as` prop can only be used with a single child',
-        )
-      }
-      if (!isValidElement(props.children)) {
-        throw new Error('LiveQuery: `as` prop requires a valid `children` prop')
-      }
-
-      return (
-        <ClientComponent
-          // eslint-disable-next-line no-warning-comments
-          // @TODO improve the typing of this
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          initialData={initialData as any}
-          query={query}
-          // eslint-disable-next-line no-warning-comments
-          // @TODO improve the typing of this
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          params={params as any}
-        >
-          <LiveComponent {...props.children.props} />
-        </ClientComponent>
-      )
-    }
-
-    // Setup a `useLiveQuery` wrapper and override the `data` prop on the children component
-    return (
-      <ClientComponent
-        // eslint-disable-next-line no-warning-comments
-        // @TODO improve the typing of this
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        initialData={initialData as any}
-        query={query}
-        // eslint-disable-next-line no-warning-comments
-        // @TODO improve the typing of this
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        params={params as any}
-      >
-        {props.children}
-      </ClientComponent>
-    )
-  }
-  ConditionalLiveQuery.displayName = 'ConditionalLiveQuery'
-  return ConditionalLiveQuery
-}
diff --git a/packages/preview-kit/src/LiveQuery/index.tsx b/packages/preview-kit/src/LiveQuery/index.tsx
deleted file mode 100644
index 730f95b6..00000000
--- a/packages/preview-kit/src/LiveQuery/index.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { lazy } from 'react'
-
-import { createConditionalLiveQuery } from './createConditionalLiveQuery'
-
-export type {
-  ClientQueryParams,
-  LiveQueryClientComponentProps,
-  LiveQueryProps,
-} from './createConditionalLiveQuery'
-
-const ClientComponent = lazy(() => import('./LiveQueryClientComponent'))
-
-/**
- * This is an experimental new API that might have breaking changes in minor versions.
- * @alpha */
-export const LiveQuery = createConditionalLiveQuery({ ClientComponent })
diff --git a/packages/preview-kit/src/LiveStoreProvider/LiveStoreProvider.tsx b/packages/preview-kit/src/LiveQueryProvider/LiveQueryProvider.tsx
similarity index 88%
rename from packages/preview-kit/src/LiveStoreProvider/LiveStoreProvider.tsx
rename to packages/preview-kit/src/LiveQueryProvider/LiveQueryProvider.tsx
index 2fa80d31..170367b8 100644
--- a/packages/preview-kit/src/LiveStoreProvider/LiveStoreProvider.tsx
+++ b/packages/preview-kit/src/LiveQueryProvider/LiveQueryProvider.tsx
@@ -22,16 +22,15 @@ import {
   useSyncExternalStore,
 } from 'react'
 
-import { defineListenerContext as Context, IsEnabledContext } from '../context'
+import { defineStoreContext as Context } from '../context'
 import type {
   DefineListenerContext,
   ListenerGetSnapshot,
   ListenerSubscribe,
-  Logger,
+  LiveQueryProviderProps,
 } from '../types'
-import { getQueryCacheKey, type QueryCacheKey } from '../utils'
 
-export type { Logger }
+const DEFAULT_TAG = 'sanity.preview-kit'
 
 // Documents share the same cache even if there are nested providers, with a Least Recently Used (LRU) cache
 const documentsCache = new LRUCache<
@@ -42,66 +41,47 @@ const documentsCache = new LRUCache<
   max: 500,
 })
 
-/**
- * @internal
- */
-export interface LiveStoreProviderProps {
-  children: React.ReactNode
-  /**
-   * The Sanity client to use for fetching data and listening to mutations.
-   */
-  client: SanityClient | SanityStegaClient
-  /**
-   * How frequently queries should be refetched in the background to refresh the parts of queries that can't be source mapped.
-   * Setting it to `0` will disable background refresh.
-   * @defaultValue 10000
-   */
-  refreshInterval?: number
-  /**
-   * Listen to mutations on the documents used by your queries, and apply patches directly to the result.
-   * Requires Content Source Maps to work.
-   * @defaultValue true
-   */
-  turboSourceMap?: boolean
-  logger?: Logger
-}
 /**
  * @internal
  */
 const LiveStoreProvider = memo(function LiveStoreProvider(
-  props: LiveStoreProviderProps,
+  props: LiveQueryProviderProps,
 ) {
-  const {
-    children,
-    client,
-    refreshInterval = 10000,
-    turboSourceMap = true,
-    logger,
-  } = props
+  const { children, refreshInterval = 10000, token } = props
 
-  // Check if the client is configured to use Content Source Maps if turbo is enabled
-  // It's wrapped inside `useMemo` so it doesn't call `client.config` more than it needs to, but unlike `useEffect` sooner rather than later
-  useMemo(() => {
-    if (turboSourceMap && !client.config().resultSourceMap) {
-      logger?.error(
-        'The client needs to be configured with `resultSourceMap: true` to enable turbo mode.`',
-      )
-    }
-  }, [client, turboSourceMap, logger])
+  if (!props.client) {
+    throw new Error(
+      'Missing a `client` prop with a configured Sanity client instance',
+    )
+  }
+
+  // Ensure these values are stable even if userland isn't memoizing properly
+  const [client] = useState(() => {
+    const { requestTagPrefix, resultSourceMap } = props.client.config()
+    return props.client.withConfig({
+      requestTagPrefix: requestTagPrefix || DEFAULT_TAG,
+      resultSourceMap:
+        resultSourceMap === 'withKeyArraySelector'
+          ? 'withKeyArraySelector'
+          : true,
+      // Set the recommended defaults, this is a convenience to make it easier to share a client config from a server component to the client component
+      ...(token && {
+        token,
+        useCdn: false,
+        perspective: 'previewDrafts',
+        ignoreBrowserTokenWarning: true,
+      }),
+    })
+  })
+  const [logger] = useState(() => props.logger)
 
-  const report = useMemo(() => {
-    if (turboSourceMap && client.config().resultSourceMap) {
-      return `Updates that can be traced using Content Source Maps will be applied in real-time. Other updates will be applied every ${refreshInterval}ms.`
-    }
-    return `Updates will be applied every ${refreshInterval}ms.`
-  }, [client, refreshInterval, turboSourceMap])
   useEffect(() => {
     if (logger) {
       logger.log(
-        `[@sanity/preview-kit]: With the current configuration you can expect that: ${report}`,
+        `[@sanity/preview-kit]: With the current configuration you can expect that: Updates that can be traced using Content Source Maps will be applied in real-time. Other updates will be applied every ${refreshInterval}ms.`,
       )
     }
-  }, [logger, report])
+  }, [logger, refreshInterval])
 
   const [subscriptions, setSubscriptions] = useState<QueryCacheKey[]>([])
   const [snapshots] = useState<QuerySnapshotsCache>(() => new Map())
@@ -139,7 +119,6 @@ const LiveStoreProvider = memo(function LiveStoreProvider(
   )
   const turboIdsFromSourceMap = useCallback(
     (contentSourceMap: ContentSourceMap) => {
-      if (!turboSourceMap) return
       // This handler only adds ids, on each query fetch. But that's ok since <Turbo /> purges ids that are unused
       const nextTurboIds = new Set<string>()
       docsInUse.clear()
@@ -164,22 +143,20 @@ const LiveStoreProvider = memo(function LiveStoreProvider(
         }),
       )
     },
-    [turboSourceMap, docsInUse],
+    [docsInUse],
   )
 
   return (
     <Context.Provider value={context}>
-      <IsEnabledContext.Provider value>{children}</IsEnabledContext.Provider>
-      {turboSourceMap && (
-        <Turbo
-          cache={hooks.cache}
-          client={client}
-          setTurboIds={setTurboIds}
-          snapshots={snapshots}
-          turboIds={turboIds}
-          docsInUse={docsInUse}
-        />
-      )}
+      {children}
+      <Turbo
+        cache={hooks.cache}
+        client={client}
+        setTurboIds={setTurboIds}
+        snapshots={snapshots}
+        turboIds={turboIds}
+        docsInUse={docsInUse}
+      />
       {subscriptions.map((key) => {
         if (!hooks.cache.has(key)) return null
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -204,7 +181,7 @@ LiveStoreProvider.displayName = 'LiveStoreProvider'
 export default LiveStoreProvider
 
 interface QuerySubscriptionProps
-  extends Required<Pick<LiveStoreProviderProps, 'client' | 'refreshInterval'>> {
+  extends Required<Pick<LiveQueryProviderProps, 'client' | 'refreshInterval'>> {
   query: string
   params: QueryParams
   listeners: Set<() => void>
@@ -367,7 +344,7 @@ type RevalidateState = 'hit' | 'stale' | 'refresh' | 'inflight'
  * Keeps track of when queries should revalidate
  */
 function useRevalidate(
-  props: Pick<LiveStoreProviderProps, 'refreshInterval'>,
+  props: Pick<LiveQueryProviderProps, 'refreshInterval'>,
 ): [RevalidateState, () => () => void] {
   const { refreshInterval } = props
 
@@ -495,7 +472,7 @@ function useHooks(
   return useMemo(() => ({ cache, subscribe }), [cache, subscribe])
 }
 
-interface TurboProps extends Pick<LiveStoreProviderProps, 'client'> {
+interface TurboProps extends Pick<LiveQueryProviderProps, 'client'> {
   turboIds: string[]
   docsInUse: Map<string, ContentSourceMapDocuments[number]>
   setTurboIds: React.Dispatch<React.SetStateAction<string[]>>
@@ -659,7 +636,7 @@ const Turbo = memo(function Turbo(props: TurboProps) {
 })
 Turbo.displayName = 'Turbo'
 
-interface GetDocumentsProps extends Pick<LiveStoreProviderProps, 'client'> {
+interface GetDocumentsProps extends Pick<LiveQueryProviderProps, 'client'> {
   projectId: string
   dataset: string
   ids: string[]
@@ -731,3 +708,10 @@ function turboChargeResultIfSourceMap(
     },
   )
 }
+
+/** @internal */
+type QueryCacheKey = `${string}-${string}`
+/** @internal */
+function getQueryCacheKey(query: string, params: QueryParams): QueryCacheKey {
+  return `${query}-${JSON.stringify(params)}`
+}
diff --git a/packages/preview-kit/src/LiveQueryProvider/createLiveQueryProvider.tsx b/packages/preview-kit/src/LiveQueryProvider/createLiveQueryProvider.tsx
deleted file mode 100644
index 7c07a7cf..00000000
--- a/packages/preview-kit/src/LiveQueryProvider/createLiveQueryProvider.tsx
+++ /dev/null
@@ -1,159 +0,0 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-import { memo, Suspense, useEffect, useMemo, useState } from 'react'
-
-import type { LiveQueryProviderProps, Logger } from '../types'
-import { DEFAULT_MAX_DOCUMENTS, DEFAULT_TAG } from '../utils'
-
-export type { LiveQueryProviderProps, Logger }
-export type { CacheOptions } from '../types'
-
-/**
- * @internal
- */
-export function createLiveQueryProvider(options: {
-  GroqStoreProvider: React.ComponentType<LiveQueryProviderProps>
-  LiveStoreProvider: React.ComponentType<LiveQueryProviderProps>
-}): React.ComponentType<LiveQueryProviderProps> {
-  const { GroqStoreProvider, LiveStoreProvider } = options
-
-  const SelectStoreProvider = memo((props: LiveQueryProviderProps) => {
-    const { children, refreshInterval, client, cache, logger } = props
-    const maxDocuments = cache?.maxDocuments ?? DEFAULT_MAX_DOCUMENTS
-    const [documentsCount, setDocumentsCount] = useState<number | null>(null)
-    const [error, setError] = useState<Error | null>(null)
-    const [includeTypes] = useState(() => cache?.includeTypes ?? [])
-
-    // Rethrow errors to the nearest error boundary
-    if (error) {
-      throw error
-    }
-
-    useEffect(() => {
-      if (documentsCount !== null) {
-        return
-      }
-
-      logger?.log('[@sanity/preview-kit]: fetch documents count')
-      const controller = new AbortController()
-      client
-        .fetch<number>(
-          includeTypes.length > 0
-            ? 'count(*[_type in $includeTypes])'
-            : 'count(*)',
-          { includeTypes },
-          { filterResponse: true, signal: controller.signal },
-        )
-        .then((result) => {
-          logger?.log('[@sanity/preview-kit]: documents count', result)
-          setDocumentsCount(result)
-        })
-        .catch((error) => {
-          if (error.name !== 'AbortError') {
-            setError(error)
-          }
-        })
-      return () => {
-        controller.abort()
-      }
-    }, [client, documentsCount, includeTypes, logger])
-
-    if (documentsCount === null) {
-      return children
-    }
-
-    if (refreshInterval && documentsCount >= maxDocuments) {
-      return (
-        <Suspense fallback={children}>
-          <LiveStoreProvider
-            client={client}
-            refreshInterval={refreshInterval}
-            turboSourceMap={false}
-            logger={logger}
-          >
-            {children}
-          </LiveStoreProvider>
-        </Suspense>
-      )
-    }
-
-    if (documentsCount >= maxDocuments) {
-      throw new Error(
-        `[@sanity/preview-kit]: You have ${documentsCount} documents in your dataset, which is more than the maximum of ${maxDocuments} documents. Please reduce the number of documents in your dataset or increase the limit.`,
-      )
-    }
-
-    return (
-      <Suspense fallback={children}>
-        <GroqStoreProvider {...props}>{children}</GroqStoreProvider>
-      </Suspense>
-    )
-  })
-  SelectStoreProvider.displayName = 'SelectStoreProvider'
-
-  const LiveQueryProvider = memo((props: LiveQueryProviderProps) => {
-    const { children, refreshInterval = 10000, token } = props
-
-    if (!props.client) {
-      throw new Error(
-        'Missing a `client` prop with a configured Sanity client instance',
-      )
-    }
-
-    // Ensure these values are stable even if userland isn't memoizing properly
-    const [client] = useState(() => {
-      const { requestTagPrefix, resultSourceMap } = props.client.config()
-      return props.client.withConfig({
-        requestTagPrefix: requestTagPrefix || DEFAULT_TAG,
-        resultSourceMap: resultSourceMap || 'withKeyArraySelector',
-        // Set the recommended defaults, this is a convenience to make it easier to share a client config from a server component to the client component
-        ...(token && {
-          token,
-          useCdn: false,
-          perspective: 'previewDrafts',
-          ignoreBrowserTokenWarning: true,
-        }),
-      })
-    })
-
-    const [cache] = useState(() => props.cache)
-    const [logger] = useState(() => props.logger)
-    const turboSourceMap = useMemo(() => {
-      const { resultSourceMap } = client.config()
-      return (
-        props.turboSourceMap ??
-        (resultSourceMap === 'withKeyArraySelector' || resultSourceMap)
-      )
-    }, [client, props.turboSourceMap])
-
-    if (turboSourceMap) {
-      return (
-        <Suspense fallback={children}>
-          <LiveStoreProvider
-            client={client}
-            logger={logger}
-            refreshInterval={refreshInterval}
-            turboSourceMap={turboSourceMap}
-          >
-            {children}
-          </LiveStoreProvider>
-        </Suspense>
-      )
-    }
-
-    return (
-      <Suspense fallback={children}>
-        <SelectStoreProvider
-          client={client}
-          cache={cache}
-          logger={logger}
-          refreshInterval={refreshInterval}
-        >
-          {children}
-        </SelectStoreProvider>
-      </Suspense>
-    )
-  })
-  LiveQueryProvider.displayName = 'LiveQueryProvider'
-
-  return LiveQueryProvider
-}
diff --git a/packages/preview-kit/src/LiveQueryProvider/index.ts b/packages/preview-kit/src/LiveQueryProvider/index.ts
new file mode 100644
index 00000000..142c9be3
--- /dev/null
+++ b/packages/preview-kit/src/LiveQueryProvider/index.ts
@@ -0,0 +1,20 @@
+import { lazy } from 'react'
+
+import type { LiveQueryProviderProps } from '../types'
+
+/** @public */
+export const LiveQueryProvider = lazy(() => import('./LiveQueryProvider'))
+
+/**
+ * @deprecated Use `LiveQueryProvider` instead
+ * @internal
+ */
+export function createLiveQueryProvider(
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  _options: {
+    GroqStoreProvider: React.ComponentType<LiveQueryProviderProps>
+    LiveStoreProvider: React.ComponentType<LiveQueryProviderProps>
+  },
+): React.ComponentType<LiveQueryProviderProps> {
+  return LiveQueryProvider
+}
diff --git a/packages/preview-kit/src/LiveQueryProvider/index.tsx b/packages/preview-kit/src/LiveQueryProvider/index.tsx
deleted file mode 100644
index 570f7beb..00000000
--- a/packages/preview-kit/src/LiveQueryProvider/index.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { lazy } from 'react'
-
-import { createLiveQueryProvider } from './createLiveQueryProvider'
-
-export * from './createLiveQueryProvider'
-
-const GroqStoreProvider = lazy(() => import('../GroqStoreProvider'))
-const LiveStoreProvider = lazy(() => import('../LiveStoreProvider'))
-
-/** @public */
-export const LiveQueryProvider = createLiveQueryProvider({
-  GroqStoreProvider,
-  LiveStoreProvider,
-})
diff --git a/packages/preview-kit/src/LiveStoreProvider/index.ts b/packages/preview-kit/src/LiveStoreProvider/index.ts
deleted file mode 100644
index 23fcb8ba..00000000
--- a/packages/preview-kit/src/LiveStoreProvider/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './LiveStoreProvider'
-export { default } from './LiveStoreProvider'
diff --git a/packages/preview-kit/src/_exports/client.ts b/packages/preview-kit/src/_exports/client.ts
deleted file mode 100644
index 59f9f192..00000000
--- a/packages/preview-kit/src/_exports/client.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '../client'
diff --git a/packages/preview-kit/src/_exports/index.ts b/packages/preview-kit/src/_exports/index.ts
deleted file mode 100644
index 8333d8c6..00000000
--- a/packages/preview-kit/src/_exports/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export {
-  type ClientQueryParams,
-  type isEqualFn,
-  type LiveQueryHookOptions,
-  type QueryLoading,
-  useIsEnabled,
-  useLiveQuery,
-} from '../hooks'
-export * from '../LiveQueryProvider'
-export { LiveQueryProvider as default } from '../LiveQueryProvider'
diff --git a/packages/preview-kit/src/_exports/internals/_create-conditional-live-query.ts b/packages/preview-kit/src/_exports/internals/_create-conditional-live-query.ts
deleted file mode 100644
index 881cd467..00000000
--- a/packages/preview-kit/src/_exports/internals/_create-conditional-live-query.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '../../LiveQuery/createConditionalLiveQuery'
diff --git a/packages/preview-kit/src/_exports/internals/_live-query.ts b/packages/preview-kit/src/_exports/internals/_live-query.ts
deleted file mode 100644
index 9937c192..00000000
--- a/packages/preview-kit/src/_exports/internals/_live-query.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from '../../LiveQuery/LiveQueryClientComponent'
-export { default } from '../../LiveQuery/LiveQueryClientComponent'
diff --git a/packages/preview-kit/src/_exports/live-query.test.ts b/packages/preview-kit/src/_exports/live-query.test.ts
deleted file mode 100644
index 88e48afe..00000000
--- a/packages/preview-kit/src/_exports/live-query.test.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { describe, expect, test } from 'vitest'
-
-describe('exports[./live-query]', () => {
-  test('should have the same exports on the react-server condition as the src', async () => {
-    expect.hasAssertions()
-    const src = await import('./live-query')
-    const reactServer = await import('../../react-server/live-query')
-    expect(Object.keys(src)).toEqual(Object.keys(reactServer))
-  })
-})
diff --git a/packages/preview-kit/src/_exports/live-query.ts b/packages/preview-kit/src/_exports/live-query.ts
deleted file mode 100644
index 90eca14a..00000000
--- a/packages/preview-kit/src/_exports/live-query.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from '../LiveQuery'
-export { LiveQuery as default } from '../LiveQuery'
diff --git a/packages/preview-kit/src/client/createClient.ts b/packages/preview-kit/src/client/createClient.ts
index ca319011..fa43cac4 100644
--- a/packages/preview-kit/src/client/createClient.ts
+++ b/packages/preview-kit/src/client/createClient.ts
@@ -13,6 +13,7 @@ export type * from './types'
 export type * from '@sanity/client'
 
 /**
+ * @public
  * @deprecated - Please use `createClient` from `@sanity/client/stega` instead
  */
 export const createClient = (
diff --git a/packages/preview-kit/src/client/types.ts b/packages/preview-kit/src/client/types.ts
index 675090a6..608492e5 100644
--- a/packages/preview-kit/src/client/types.ts
+++ b/packages/preview-kit/src/client/types.ts
@@ -21,6 +21,7 @@ export type ContentSourceMapQueryResponse =
   | RawQueryResponse<unknown>
   | Pick<RawQueryResponse<unknown>, 'result' | 'resultSourceMap'>
 
+/** @public */
 export interface PreviewKitClientConfig extends ClientConfig {
   /**
      * Some strings shouldn't be encoded, for example if you store internal URLs the stega characters will break routing.
diff --git a/packages/preview-kit/src/context.ts b/packages/preview-kit/src/context.ts
index e55a6e49..b7ab3563 100644
--- a/packages/preview-kit/src/context.ts
+++ b/packages/preview-kit/src/context.ts
@@ -1,26 +1,10 @@
 import { createContext } from 'react'
 
-import { NoStoreContext } from './no-store'
 import { DefineListenerContext } from './types'
-import { QueryCacheKey } from './utils'
 
 /**
  * @internal
  */
-export const defineListenerContext =
-  createContext<DefineListenerContext>(NoStoreContext)
-
-/**
- * If it's `null` then the listener should be treated as `success`, otherwise if a listener isn't in the array it should be considered as `loading`
- * @internal
- */
-export const LoadedListenersContext = createContext<QueryCacheKey[] | null>(
+export const defineStoreContext = createContext<DefineListenerContext | null>(
   null,
 )
-
-/**
- * Aids in debugging, notifying if the parent has a GroqStoreProvider, or a LiveStoreProvider, and is thus `live`.
- * This is helpful as the `useLiveQuery` hook itself works even if no provider is present, but it will not be `live`.
- * @internal
- */
-export const IsEnabledContext = createContext<boolean>(false)
diff --git a/packages/preview-kit/src/hooks.ts b/packages/preview-kit/src/hooks.ts
index 28ca7586..d21ae922 100644
--- a/packages/preview-kit/src/hooks.ts
+++ b/packages/preview-kit/src/hooks.ts
@@ -3,15 +3,14 @@ import { useCallback, useContext, useMemo, useState } from 'react'
 import isFastEqual from 'react-fast-compare'
 import { useSyncExternalStoreWithSelector } from 'use-sync-external-store/with-selector'
 
+import { defineStoreContext } from './context'
 import {
-  defineListenerContext,
-  IsEnabledContext,
-  LoadedListenersContext,
-} from './context'
-import { getQueryCacheKey, useParams } from './utils'
-
-// Re-export types we use that are needed externally
-export type { ClientQueryParams }
+  ListenerGetSnapshot,
+  ListenerSubscribe,
+  QueryEnabled,
+  QueryLoading,
+} from './types'
+import { useParams } from './utils/useParams'
 
 /**
  * By default 'react-fast-compare' is used to check if the query result has changed.
@@ -26,9 +25,6 @@ export interface LiveQueryHookOptions<QueryResult> {
   isEqual?: isEqualFn<QueryResult>
 }
 
-/** @public */
-export type QueryLoading = boolean
-
 /** @public */
 export function useLiveQuery<
   QueryResult,
@@ -38,13 +34,30 @@ export function useLiveQuery<
   query: string,
   queryParams?: QueryParams,
   options?: LiveQueryHookOptions<QueryResult>,
-): [QueryResult, QueryLoading] {
+): [QueryResult, QueryLoading, QueryEnabled] {
   const { isEqual = isFastEqual } = options || {}
 
-  const defineStore = useContext(defineListenerContext)
+  const defineStore = useContext(defineStoreContext)
   const params = useParams(queryParams)
-  const store = useMemo(
-    () => defineStore<QueryResult>(initialData, query, params),
+  const noStore = useMemo(
+    () => ({
+      subscribe: (() => () => {}) satisfies ListenerSubscribe,
+      getSnapshot: () => initialData,
+    }),
+    [initialData],
+  )
+  const store = useMemo<
+    | {
+        subscribe: ListenerSubscribe
+        getSnapshot: ListenerGetSnapshot<QueryResult>
+      }
+    | undefined
+  >(
+    () =>
+      defineStore?.<QueryResult>(initialData, query, params) || {
+        subscribe: (() => () => {}) satisfies ListenerSubscribe,
+        getSnapshot: () => initialData,
+      },
     [defineStore, initialData, params, query],
   )
   // initialSnapshot might change before hydration is done, so deep cloning it on the first hook call
@@ -70,34 +83,16 @@ export function useLiveQuery<
   const selector = useCallback((snapshot: QueryResult) => snapshot, [])
 
   const snapshot = useSyncExternalStoreWithSelector(
-    store.subscribe,
-    store.getSnapshot,
+    store?.subscribe || noStore.subscribe,
+    store?.getSnapshot || noStore.getSnapshot,
     getServerSnapshot,
     selector,
     isEqual,
   )
-  const loading = useLiveQueryIsLoading(query, params)
-
-  return [snapshot, loading]
-}
+  const enabled = defineStore !== null
+  const loading = enabled && serverSnapshot === snapshot
 
-/**
- * Wether a particular query is loading or not.
- * @public
- */
-function useLiveQueryIsLoading(
-  query: string,
-  params: ClientQueryParams,
-): QueryLoading {
-  const loadedListeners = useContext(LoadedListenersContext)
-  const key = useMemo(() => getQueryCacheKey(query, params), [params, query])
-
-  return useMemo(() => {
-    if (Array.isArray(loadedListeners)) {
-      return loadedListeners.includes(key) ? false : true
-    }
-    return false
-  }, [key, loadedListeners])
+  return [snapshot, loading, enabled]
 }
 
 /**
@@ -106,7 +101,8 @@ function useLiveQueryIsLoading(
  * This hook on the other hand does know. If it returns `false` then sibling `useLiveQuery` hooks are not "live".
  * If it returns `true` then sibling `useLiveQuery` hooks are "live" as there is a parent `LiveQueryProvider` in the tree that is loaded and active.
  * @public
+ * @deprecated use `useLiveQuery` instead: `const [,,enabled] = useLiveQuery(initialData, query, params)`
  */
 export function useIsEnabled(): boolean {
-  return useContext(IsEnabledContext)
+  return useContext(defineStoreContext) !== null
 }
diff --git a/packages/preview-kit/src/index.ts b/packages/preview-kit/src/index.ts
new file mode 100644
index 00000000..24ed904e
--- /dev/null
+++ b/packages/preview-kit/src/index.ts
@@ -0,0 +1,16 @@
+export {
+  type isEqualFn,
+  type LiveQueryHookOptions,
+  useIsEnabled,
+  useLiveQuery,
+} from './hooks'
+export {
+  createLiveQueryProvider,
+  /**
+   * Re-export to make `LiveQueryProvider` easier to use with `React.lazy`
+   * @public
+   */
+  LiveQueryProvider as default,
+  LiveQueryProvider,
+} from './LiveQueryProvider'
+export type * from './types'
diff --git a/packages/preview-kit/src/live-query/LiveQuery.tsx b/packages/preview-kit/src/live-query/LiveQuery.tsx
new file mode 100644
index 00000000..ebe65ccc
--- /dev/null
+++ b/packages/preview-kit/src/live-query/LiveQuery.tsx
@@ -0,0 +1,84 @@
+import type { QueryParams as ClientQueryParams } from '@sanity/client'
+import { Children, isValidElement, lazy } from 'react'
+
+import type { LiveQueryClientComponentProps } from './LiveQueryClientComponent'
+
+const ClientComponent = lazy(() => import('./LiveQueryClientComponent'))
+
+/** @public */
+export interface LiveQueryProps<
+  QueryResult,
+  QueryParams extends ClientQueryParams = ClientQueryParams,
+> extends LiveQueryClientComponentProps<QueryResult, QueryParams> {
+  enabled: boolean
+  // eslint-disable-next-line no-warning-comments
+  // @TODO fix typing of this
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  as?: React.ComponentType<any>
+}
+
+const DEFAULT_PARAMS = {} as ClientQueryParams
+
+/** @public */
+export function LiveQuery<
+  QueryResult,
+  QueryParams extends ClientQueryParams = ClientQueryParams,
+>(props: LiveQueryProps<QueryResult, QueryParams>): React.ReactNode {
+  // Always passthrough when not enabled
+  if (!props.enabled) {
+    return props.children
+  }
+
+  const {
+    query,
+    params = DEFAULT_PARAMS,
+    initialData,
+    as: LiveComponent,
+  } = props
+  // If we have an `as` prop it means we're likely working around a `children` that is RSC, and the `as` prop provides a Client Component
+  if (LiveComponent) {
+    if (Children.count(props.children) > 1) {
+      throw new Error(
+        'LiveQuery: `as` prop can only be used with a single child',
+      )
+    }
+    if (!isValidElement(props.children)) {
+      throw new Error('LiveQuery: `as` prop requires a valid `children` prop')
+    }
+
+    return (
+      <ClientComponent
+        // eslint-disable-next-line no-warning-comments
+        // @TODO improve the typing of this
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        initialData={initialData as any}
+        query={query}
+        // eslint-disable-next-line no-warning-comments
+        // @TODO improve the typing of this
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        params={params as any}
+        throwOnMissingProvider={props.throwOnMissingProvider}
+      >
+        <LiveComponent {...props.children.props} />
+      </ClientComponent>
+    )
+  }
+
+  // Setup a `useLiveQuery` wrapper and override the `data` prop on the children component
+  return (
+    <ClientComponent
+      // eslint-disable-next-line no-warning-comments
+      // @TODO improve the typing of this
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      initialData={initialData as any}
+      query={query}
+      // eslint-disable-next-line no-warning-comments
+      // @TODO improve the typing of this
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      params={params as any}
+    >
+      {props.children}
+    </ClientComponent>
+  )
+}
+LiveQuery.displayName = 'LiveQuery'
diff --git a/packages/preview-kit/src/live-query/LiveQueryClientComponent.tsx b/packages/preview-kit/src/live-query/LiveQueryClientComponent.tsx
new file mode 100644
index 00000000..d44e33fd
--- /dev/null
+++ b/packages/preview-kit/src/live-query/LiveQueryClientComponent.tsx
@@ -0,0 +1,74 @@
+import type { QueryParams as ClientQueryParams } from '@sanity/client'
+import type { PropsWithChildren } from 'react'
+import { Children, cloneElement, isValidElement, memo } from 'react'
+
+import { useLiveQuery } from './useLiveQuery'
+
+/** @public */
+export type LiveQueryClientComponentProps<QueryResult, QueryParams> =
+  PropsWithChildren<{
+    /**
+     * If a parent <LiveQueryProvider> is missing, then an error is thrown.
+     * If you want to disable this behavior, set this prop to false.
+     * @defaultValue true
+     */
+    throwOnMissingProvider?: boolean
+    initialData: QueryResult
+    query: string
+    params?: QueryParams | undefined
+  }>
+
+// Browser-only preview component, overwrites the data prop with live data on-demand
+function LiveQueryClientComponent<
+  QueryResult,
+  QueryParams extends ClientQueryParams = ClientQueryParams,
+>(
+  props: LiveQueryClientComponentProps<QueryResult, QueryParams>,
+): React.ReactNode {
+  const {
+    initialData,
+    query,
+    params,
+    children,
+    throwOnMissingProvider = true,
+  } = props
+  const [data, enabled] = useLiveQuery<QueryResult, QueryParams>(
+    initialData,
+    query,
+    params,
+  )
+  // This hook is only used by `LiveQuery` when its `enabled` prop is true,
+  // so we can reliably assume that if a parent provider is missing then that's an error
+  if (throwOnMissingProvider && !enabled) {
+    // Throw and let them know a parent <LiveQueryProvider> is missing
+    throw new Error(
+      `<LiveQuery> require you to wrap them in a parent <LiveQueryProvider> when its 'enabled' prop is true, or set the 'throwOnMissingProvider' prop to 'false' to ignore this error`,
+    )
+  }
+
+  /**
+   * The original source for the rest of this component is `Slot` from `@radix-ui/react-slot`: https://github.com/radix-ui/primitives/blob/3e0642e40038386d58da9fb1d812c2fbfe9f67c1/packages/react/slot/src/Slot.tsx
+   * It's copied and modified here as the original doesn't override the props on children, which would require us to use this pattern:
+   * ```<LiveQuery initialData={data}><Posts /></LiveQuery>```
+   * However, we want to use this pattern as it preserves the same type safety as before live queries are added:
+   * ```<LiveQuery initialData={data}><Posts data={data} /></LiveQuery>```
+   *
+   * It also made sense to modify the original as our use case is smaller than radix, for example we don't have to worry about merging `style` props
+   */
+  if (isValidElement(children)) {
+    return cloneElement(children, {
+      ...children.props,
+      // all child props should override, except for `data`
+      data,
+      // eslint-disable-next-line no-warning-comments
+      // @ts-expect-error -- @todo fix the typings
+      ref: children.ref,
+    })
+  }
+
+  return Children.count(children) > 1 ? Children.only(null) : null
+}
+LiveQueryClientComponent.displayName = 'LiveQueryClientComponent'
+
+const LiveQueryClientComponentMemo = memo(LiveQueryClientComponent)
+export default LiveQueryClientComponentMemo
diff --git a/packages/preview-kit/src/live-query/index.ts b/packages/preview-kit/src/live-query/index.ts
new file mode 100644
index 00000000..f5531970
--- /dev/null
+++ b/packages/preview-kit/src/live-query/index.ts
@@ -0,0 +1,10 @@
+export type { LiveQueryProps } from './LiveQuery'
+export {
+  /**
+   * Re-export the `LiveQuery` component as the default export to make it easier to use with `React.lazy`
+   * @public
+   */
+  LiveQuery as default,
+  LiveQuery,
+} from './LiveQuery'
+export type { LiveQueryClientComponentProps } from './LiveQueryClientComponent'
diff --git a/packages/preview-kit/src/LiveQuery/useLiveQuery.ts b/packages/preview-kit/src/live-query/useLiveQuery.ts
similarity index 74%
rename from packages/preview-kit/src/LiveQuery/useLiveQuery.ts
rename to packages/preview-kit/src/live-query/useLiveQuery.ts
index 49e08f65..6722d08c 100644
--- a/packages/preview-kit/src/LiveQuery/useLiveQuery.ts
+++ b/packages/preview-kit/src/live-query/useLiveQuery.ts
@@ -10,13 +10,11 @@ import {
   useSyncExternalStore,
 } from 'react'
 
-import { defineListenerContext } from '../context'
-import { useParams } from '../utils'
+import { defineStoreContext } from '../context'
+import { QueryEnabled } from '../types'
+import { useParams } from '../utils/useParams'
 
-// Re-export types we use that are needed externally
-export type { ClientQueryParams }
-
-/** @public */
+/** @internal */
 export function useLiveQuery<
   QueryResult,
   QueryParams extends ClientQueryParams = ClientQueryParams,
@@ -24,11 +22,11 @@ export function useLiveQuery<
   initialData: QueryResult,
   query: string,
   queryParams2?: QueryParams,
-): QueryResult {
-  const defineStore = useContext(defineListenerContext)
+): [QueryResult, QueryEnabled] {
+  const defineStore = useContext(defineStoreContext)
   const queryParams = useParams(queryParams2)
   const store = useMemo(
-    () => defineStore<QueryResult>(initialData, query, queryParams),
+    () => defineStore?.<QueryResult>(initialData, query, queryParams),
     [defineStore, initialData, queryParams, query],
   )
   // initialSnapshot might change before hydration is done, so deep cloning it on the first hook call
@@ -52,9 +50,16 @@ export function useLiveQuery<
   })
   const getServerSnapshot = useCallback(() => serverSnapshot, [serverSnapshot])
 
-  return useSyncExternalStore(
-    store.subscribe,
-    store.getSnapshot,
-    getServerSnapshot,
-  )
+  return [
+    useSyncExternalStore(
+      store?.subscribe || noop,
+      store?.getSnapshot || getServerSnapshot,
+      getServerSnapshot,
+    ),
+    defineStore !== null,
+  ]
+}
+
+function noop() {
+  return () => {}
 }
diff --git a/packages/preview-kit/src/no-store.ts b/packages/preview-kit/src/no-store.ts
deleted file mode 100644
index 997902ae..00000000
--- a/packages/preview-kit/src/no-store.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-// This is the default, fallback store, that allows using useLiveQuery without a provider.
-import type { QueryParams } from '@sanity/client'
-
-import type {
-  DefineListenerContext,
-  ListenerGetSnapshot,
-  ListenerSubscribe,
-} from './types'
-import { getQueryCacheKey, type QueryCacheKey } from './utils'
-
-const snapshots = new Map<QueryCacheKey, unknown>()
-const deps = new Map<QueryCacheKey, number>()
-
-/**
- * @internal
- */
-export const NoStoreContext = function defineListener<QueryResult>(
-  initialSnapshot: QueryResult,
-  query: string,
-  params: QueryParams,
-) {
-  const key = getQueryCacheKey(query, params)
-
-  // Always update the snapshot, to ensure that we have the latest value
-  snapshots.set(key, initialSnapshot)
-  // Keep track of how many dependencies are using this query, so we can know when it's safe to cleanup
-  if (!deps.has(key)) {
-    deps.set(key, 0)
-  }
-
-  const subscribe: ListenerSubscribe = () => {
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    deps.set(key, deps.get(key)! + 1)
-
-    return () => {
-      // Bookkeeping on how many dependencies are using this query
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      deps.set(key, deps.get(key)! - 1)
-
-      // If nothing cares about this snapshot, clean it up and free memory
-      if (deps.get(key) === 0) {
-        snapshots.delete(key)
-      }
-    }
-  }
-  const getSnapshot: ListenerGetSnapshot<QueryResult> = () =>
-    snapshots.has(key) ? (snapshots.get(key) as QueryResult) : initialSnapshot
-
-  return { subscribe, getSnapshot }
-} satisfies DefineListenerContext
diff --git a/packages/preview-kit/src/types.ts b/packages/preview-kit/src/types.ts
index 84cdc9a1..1521ece2 100644
--- a/packages/preview-kit/src/types.ts
+++ b/packages/preview-kit/src/types.ts
@@ -31,7 +31,10 @@ export type Logger =
   | typeof console
   | Pick<typeof console, 'warn' | 'error' | 'log'>
 
-/** @public */
+/**
+ * @public
+ * @deprecated these options are no longer used
+ */
 export interface CacheOptions {
   /**
    * Uses a `Listen` API call with EventSource to stream updates in real-time to the documents cache
@@ -53,6 +56,9 @@ export interface CacheOptions {
 /** @public */
 export interface LiveQueryProviderProps {
   children: React.ReactNode
+  /**
+   * The Sanity client to use for fetching data and listening to mutations.
+   */
   client: SanityClient | SanityStegaClient
   /**
    * Reconfigures `client` with the provided `token`, as well as changing its configuration to
@@ -61,18 +67,23 @@ export interface LiveQueryProviderProps {
    * for example by: `client={client.withConfig({token})}`
    */
   token?: string
+  /** @deprecated these options are no longer used */
   cache?: CacheOptions
   /**
-   * Uses a `Listen` API call with EventSource to stream updates in real-time to the documents cache, powered by `Content Source Map` metadata
-   * @defaultValue true
+   * @deprecated this option is now always enabled
    */
   turboSourceMap?: boolean
   /**
-   * The interval in millieseconds to refetch in the background, when the tab is active.
-   * It's only used if `turboSourceMap` is set to `true` or there are too many documents to fit in the local cache.
-   * Set it to `0` to disable background refresh.
+   * How frequently queries should be refetched in the background to refresh the parts of queries that can't be source mapped.
+   * Setting it to `0` will disable background refresh.
    * @defaultValue 10000
    */
   refreshInterval?: number
   logger?: Logger
 }
+
+/** @public */
+export type QueryLoading = boolean
+
+/** @public */
+export type QueryEnabled = boolean
diff --git a/packages/preview-kit/src/utils.ts b/packages/preview-kit/src/utils.ts
deleted file mode 100644
index c900114c..00000000
--- a/packages/preview-kit/src/utils.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import type { QueryParams } from '@sanity/client'
-import {
-  startTransition,
-  useCallback,
-  useEffect,
-  useMemo,
-  useReducer,
-  useRef,
-} from 'react'
-
-/**
- * @internal
- */
-export type QueryCacheKey = `${string}-${string}`
-/**
- * @internal
- */
-export function getQueryCacheKey(
-  query: string,
-  params: QueryParams,
-): QueryCacheKey {
-  return `${query}-${JSON.stringify(params)}`
-}
-
-/**
- * Return params that are stable with deep equal as long as the key order is the same
- * @internal
- */
-export function useParams(
-  params?: undefined | null | QueryParams,
-): QueryParams {
-  const stringifiedParams = useMemo(
-    () => JSON.stringify(params || {}),
-    [params],
-  )
-  return useMemo(() => JSON.parse(stringifiedParams), [stringifiedParams])
-}
-
-/**
- * @internal
- */
-export function useLoadingListenersContext(
-  ready: Set<QueryCacheKey>,
-): [QueryCacheKey[], () => void] {
-  const [tick, forceUpdate] = useReducer((x) => x + 1, 0)
-  const mountedRef = useRef(true)
-  const scheduleUpdate = useCallback(() => {
-    if (mountedRef.current) {
-      startTransition(() => forceUpdate())
-    }
-  }, [])
-  useEffect(() => {
-    mountedRef.current = true
-    scheduleUpdate()
-    return () => {
-      mountedRef.current = false
-    }
-  }, [scheduleUpdate])
-  const loadedListenersContext = useMemo(
-    () => (tick ? [...ready] : []),
-    [ready, tick],
-  )
-
-  return [loadedListenersContext, scheduleUpdate]
-}
-
-export const DEFAULT_MAX_DOCUMENTS = 3000
-export const DEFAULT_TAG = 'sanity.preview-kit'
diff --git a/packages/preview-kit/src/utils/useParams.ts b/packages/preview-kit/src/utils/useParams.ts
new file mode 100644
index 00000000..4fab26d3
--- /dev/null
+++ b/packages/preview-kit/src/utils/useParams.ts
@@ -0,0 +1,16 @@
+import type { QueryParams } from '@sanity/client'
+import { useMemo } from 'react'
+
+/**
+ * Return params that are stable with deep equal as long as the key order is the same
+ * @internal
+ */
+export function useParams(
+  params?: undefined | null | QueryParams,
+): QueryParams {
+  const stringifiedParams = useMemo(
+    () => JSON.stringify(params || {}),
+    [params],
+  )
+  return useMemo(() => JSON.parse(stringifiedParams), [stringifiedParams])
+}
diff --git a/packages/preview-kit/tsconfig.build.json b/packages/preview-kit/tsconfig.build.json
index 9dac0027..d2562f5f 100644
--- a/packages/preview-kit/tsconfig.build.json
+++ b/packages/preview-kit/tsconfig.build.json
@@ -8,5 +8,5 @@
     "declarationDir": "lib/dts"
   },
   "include": ["src/**/*.ts", "src/**/*.tsx"],
-  "exclude": ["dist", "node_modules", "react-server"]
+  "exclude": ["dist", "node_modules"]
 }
diff --git a/packages/preview-kit/tsconfig.json b/packages/preview-kit/tsconfig.json
index a95b57b1..47575b17 100644
--- a/packages/preview-kit/tsconfig.json
+++ b/packages/preview-kit/tsconfig.json
@@ -9,5 +9,5 @@
     }
   },
   "include": ["**/*.ts", "**/*.tsx"],
-  "exclude": ["dist", "node_modules", "react-server"]
+  "exclude": ["dist", "node_modules"]
 }
diff --git a/packages/preview-kit/turbo.json b/packages/preview-kit/turbo.json
index bd9de890..59c7384b 100644
--- a/packages/preview-kit/turbo.json
+++ b/packages/preview-kit/turbo.json
@@ -3,14 +3,7 @@
   "extends": ["//"],
   "pipeline": {
     "build": {
-      "outputs": [
-        "dist/**",
-        "internal/**",
-        "!internal/.gitkeep",
-        "client.js",
-        "csm.js",
-        "live-query.js"
-      ]
+      "outputs": ["dist/**"]
     }
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 91ac486e..2ed1f486 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -254,12 +254,6 @@ importers:
 
   packages/preview-kit:
     dependencies:
-      '@sanity/eventsource':
-        specifier: 5.0.1
-        version: 5.0.1
-      '@sanity/groq-store':
-        specifier: 4.1.3
-        version: 4.1.3
       '@sanity/preview-kit-compat':
         specifier: 1.0.1
         version: 1.0.1(@sanity/client@6.9.1)(react@18.2.0)
@@ -279,12 +273,15 @@ importers:
         specifier: 1.2.0
         version: 1.2.0(react@18.2.0)
     devDependencies:
+      '@rollup/plugin-terser':
+        specifier: ^0.4.4
+        version: 0.4.4(rollup@4.6.0)
       '@sanity/client':
         specifier: ^6.9.1
         version: 6.9.1
       '@sanity/pkg-utils':
-        specifier: ^3.2.5
-        version: 3.2.5(@types/node@18.18.9)(typescript@5.3.2)
+        specifier: 3.2.6-canary.0
+        version: 3.2.6-canary.0(@types/node@18.18.9)(typescript@5.3.2)
       '@sanity/semantic-release-preset':
         specifier: ^4.1.6
         version: 4.1.6(semantic-release@22.0.8)
@@ -372,7 +369,7 @@ importers:
     devDependencies:
       '@sanity/pkg-utils':
         specifier: ^3.2.5
-        version: 3.2.5(@types/node@18.18.9)(typescript@5.3.2)
+        version: 3.2.5(typescript@5.3.2)
       '@types/react':
         specifier: ^18.2.39
         version: 18.2.39
@@ -3591,23 +3588,6 @@ packages:
     resolution: {integrity: sha512-wtMYcV5GIDIhVyF/jjmdwq1GdlK07dRL40XMns73VbrFI7FteRltxv48bhYVZPcLkRXb0SHjpDS/icj9/yzbVA==}
     dev: false
 
-  /@sanity/groq-store@4.1.3:
-    resolution: {integrity: sha512-Yh3zbCkpnrowIG8+tMoZHGxV9HFMWVlZ4zhNfF1Y2rygi14SJteV+ildrlq3/OFq9/Y/cc6iXSD/+U6dErIpNw==}
-    engines: {node: '>= 18'}
-    dependencies:
-      '@sanity/eventsource': 5.0.1
-      '@sanity/types': 3.20.2
-      fast-deep-equal: 3.1.3
-      groq: 3.20.2
-      groq-js: 1.3.0
-      mendoza: 3.0.3
-      simple-get: 4.0.1
-      split2: 4.2.0
-      throttle-debounce: 5.0.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
   /@sanity/groq-store@5.0.1-experimental(@sanity/client@6.9.1):
     resolution: {integrity: sha512-3qKQVxQW7j0n4DbmiFzEhC9jLK51u2F0d1xGYUWn0dUU5wrot2BfdlINGdCFze9FjvoPrOkihD6rc51Gfnk2xg==}
     engines: {node: '>=18'}
@@ -3717,7 +3697,7 @@ packages:
       - supports-color
     dev: false
 
-  /@sanity/pkg-utils@3.2.5(@types/node@18.18.9)(typescript@5.3.2):
+  /@sanity/pkg-utils@3.2.5(typescript@5.3.2):
     resolution: {integrity: sha512-znnS/ACvgtqVmFxcDnq9TtIO5E5nWjB3OP2eT0rqnm5lVsRJkOMPKrlb4lNxXhmJ7JR26sqaEAQ0a8fd5Ny37Q==}
     engines: {node: '>=16.0.0'}
     hasBin: true
@@ -3769,6 +3749,58 @@ packages:
       - supports-color
     dev: true
 
+  /@sanity/pkg-utils@3.2.6-canary.0(@types/node@18.18.9)(typescript@5.3.2):
+    resolution: {integrity: sha512-DsShVufIJ6rJrCkpeaL9EijqOTCUIMdgV1HI0LusGPf3Ir5stOgRlHZD9xLI1bPHwJqIXl8zxQAZN3A2BNJscA==}
+    engines: {node: '>=16.0.0'}
+    hasBin: true
+    peerDependencies:
+      typescript: ^4.7 || ^5
+    dependencies:
+      '@babel/core': 7.23.3
+      '@babel/preset-env': 7.23.3(@babel/core@7.23.3)
+      '@babel/types': 7.23.4
+      '@microsoft/api-extractor': 7.38.3(@types/node@18.18.9)
+      '@microsoft/tsdoc-config': 0.16.2
+      '@rollup/plugin-alias': 5.1.0(rollup@4.6.0)
+      '@rollup/plugin-babel': 6.0.4(@babel/core@7.23.3)(rollup@4.6.0)
+      '@rollup/plugin-commonjs': 25.0.7(rollup@4.6.0)
+      '@rollup/plugin-json': 6.0.1(rollup@4.6.0)
+      '@rollup/plugin-node-resolve': 15.2.3(rollup@4.6.0)
+      '@rollup/plugin-replace': 5.0.5(rollup@4.6.0)
+      '@rollup/plugin-terser': 0.4.4(rollup@4.6.0)
+      browserslist: 4.22.1
+      cac: 6.7.14
+      chalk: 4.1.2
+      chokidar: 3.5.3
+      esbuild: 0.19.8
+      esbuild-register: 3.5.0(esbuild@0.19.8)
+      find-config: 1.0.0
+      get-latest-version: 5.1.0
+      git-url-parse: 13.1.1
+      globby: 11.1.0
+      jsonc-parser: 3.2.0
+      mkdirp: 3.0.1
+      outdent: 0.8.0
+      parse-git-config: 3.0.0
+      pkg-up: 3.1.0
+      prettier: 3.1.0
+      prettier-plugin-packagejson: 2.4.6(prettier@3.1.0)
+      pretty-bytes: 5.6.0
+      prompts: 2.4.2
+      rimraf: 4.4.1
+      rollup: 4.6.0
+      rollup-plugin-esbuild: 6.1.0(esbuild@0.19.8)(rollup@4.6.0)
+      rxjs: 7.8.1
+      treeify: 1.1.0
+      typescript: 5.3.2
+      uuid: 9.0.1
+      zod: 3.22.4
+    transitivePeerDependencies:
+      - '@types/babel__core'
+      - '@types/node'
+      - supports-color
+    dev: true
+
   /@sanity/portable-text-editor@3.20.2(react-dom@18.2.0)(react@18.2.0)(rxjs@7.8.1)(styled-components@6.1.1):
     resolution: {integrity: sha512-t+0yxXEuBDwy7PFrhjCvoSYDWaAHNU5M+syFuIgaMyZz+tAjOweYNvSnvINDlXornaFe/YDhgt7XyEzy048ywA==}
     engines: {node: '>=18'}
@@ -6175,6 +6207,7 @@ packages:
     engines: {node: '>=10'}
     dependencies:
       mimic-response: 3.1.0
+    dev: true
 
   /decompress-response@7.0.0:
     resolution: {integrity: sha512-6IvPrADQyyPGLpMnUh6kfKiqy7SrbXbjoUuZ90WMBJKErzv2pCiwlGEXjRX9/54OnTq+XFVnkOnOMzclLI5aEA==}
@@ -12249,18 +12282,6 @@ packages:
       pkg-conf: 2.1.0
     dev: true
 
-  /simple-concat@1.0.1:
-    resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==}
-    dev: false
-
-  /simple-get@4.0.1:
-    resolution: {integrity: sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==}
-    dependencies:
-      decompress-response: 6.0.0
-      once: 1.4.0
-      simple-concat: 1.0.1
-    dev: false
-
   /simple-wcswidth@1.0.1:
     resolution: {integrity: sha512-xMO/8eNREtaROt7tJvWJqHBDTMFN4eiQ5I4JRMuilwfnFcV5W9u7RUkueNkdw0jPqGMX36iCywelS5yilTuOxg==}
     dev: false
@@ -12456,6 +12477,7 @@ packages:
   /split2@4.2.0:
     resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==}
     engines: {node: '>= 10.x'}
+    dev: true
 
   /sprintf-js@1.0.3:
     resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
@@ -12814,11 +12836,6 @@ packages:
   /text-table@0.2.0:
     resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
 
-  /throttle-debounce@5.0.0:
-    resolution: {integrity: sha512-2iQTSgkkc1Zyk0MeVrt/3BvuOXYPl/R8Z0U2xxo9rjwNciaHDG3R+Lm6dh4EeUci49DanvBnuqI6jshoQQRGEg==}
-    engines: {node: '>=12.22'}
-    dev: false
-
   /through2@2.0.5:
     resolution: {integrity: sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==}
     dependencies: