diff --git a/.changeset/pre.json b/.changeset/pre.json
index 8196a6ee5d..58e43260d9 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -35,6 +35,7 @@
     "legal-signs-call",
     "slimy-mice-relate",
     "solid-beta-15-upgrade",
+    "solid-beta-21-upgrade",
     "sour-balloons-nail",
     "whole-coins-count"
   ]
diff --git a/examples/solid/astro/package.json b/examples/solid/astro/package.json
index c1ff5a7ed7..e4605a83b3 100644
--- a/examples/solid/astro/package.json
+++ b/examples/solid/astro/package.json
@@ -15,8 +15,8 @@
     "@astrojs/solid-js": "^5.0.7",
     "@astrojs/tailwind": "^6.0.2",
     "@astrojs/vercel": "^8.1.3",
-    "@tanstack/solid-query": "^6.0.0-beta.5",
-    "@tanstack/solid-query-devtools": "^6.0.0-beta.5",
+    "@tanstack/solid-query": "^6.0.0-beta.6",
+    "@tanstack/solid-query-devtools": "^6.0.0-beta.6",
     "astro": "^5.5.6",
     "@solidjs/web": "2.0.0-beta.21",
     "solid-js": "2.0.0-beta.21",
diff --git a/examples/solid/basic-graphql-request/package.json b/examples/solid/basic-graphql-request/package.json
index 04eb8e1375..b01252718c 100644
--- a/examples/solid/basic-graphql-request/package.json
+++ b/examples/solid/basic-graphql-request/package.json
@@ -8,8 +8,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/solid-query": "^6.0.0-beta.5",
-    "@tanstack/solid-query-devtools": "^6.0.0-beta.5",
+    "@tanstack/solid-query": "^6.0.0-beta.6",
+    "@tanstack/solid-query-devtools": "^6.0.0-beta.6",
     "graphql": "^16.9.0",
     "graphql-request": "^7.1.2",
     "@solidjs/web": "2.0.0-beta.21",
diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json
index f0560fb8f1..4973872770 100644
--- a/examples/solid/basic/package.json
+++ b/examples/solid/basic/package.json
@@ -8,8 +8,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/solid-query": "^6.0.0-beta.5",
-    "@tanstack/solid-query-devtools": "^6.0.0-beta.5",
+    "@tanstack/solid-query": "^6.0.0-beta.6",
+    "@tanstack/solid-query-devtools": "^6.0.0-beta.6",
     "@solidjs/web": "2.0.0-beta.21",
     "solid-js": "2.0.0-beta.21"
   },
diff --git a/examples/solid/default-query-function/package.json b/examples/solid/default-query-function/package.json
index 7669507b93..ae676bdc5a 100644
--- a/examples/solid/default-query-function/package.json
+++ b/examples/solid/default-query-function/package.json
@@ -8,8 +8,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/solid-query": "^6.0.0-beta.5",
-    "@tanstack/solid-query-devtools": "^6.0.0-beta.5",
+    "@tanstack/solid-query": "^6.0.0-beta.6",
+    "@tanstack/solid-query-devtools": "^6.0.0-beta.6",
     "@solidjs/web": "2.0.0-beta.21",
     "solid-js": "2.0.0-beta.21"
   },
diff --git a/examples/solid/offline/package.json b/examples/solid/offline/package.json
index fc2765ead4..17575dfee6 100644
--- a/examples/solid/offline/package.json
+++ b/examples/solid/offline/package.json
@@ -9,9 +9,9 @@
   },
   "dependencies": {
     "@tanstack/query-async-storage-persister": "^5.101.0",
-    "@tanstack/solid-query": "^6.0.0-beta.5",
-    "@tanstack/solid-query-devtools": "^6.0.0-beta.5",
-    "@tanstack/solid-query-persist-client": "^6.0.0-beta.5",
+    "@tanstack/solid-query": "^6.0.0-beta.6",
+    "@tanstack/solid-query-devtools": "^6.0.0-beta.6",
+    "@tanstack/solid-query-persist-client": "^6.0.0-beta.6",
     "msw": "^2.6.6",
     "@solidjs/web": "2.0.0-beta.21",
     "solid-js": "2.0.0-beta.21"
diff --git a/examples/solid/simple/package.json b/examples/solid/simple/package.json
index 0b9f4055ee..e767241cfa 100644
--- a/examples/solid/simple/package.json
+++ b/examples/solid/simple/package.json
@@ -8,8 +8,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/solid-query": "^6.0.0-beta.5",
-    "@tanstack/solid-query-devtools": "^6.0.0-beta.5",
+    "@tanstack/solid-query": "^6.0.0-beta.6",
+    "@tanstack/solid-query-devtools": "^6.0.0-beta.6",
     "@solidjs/web": "2.0.0-beta.21",
     "solid-js": "2.0.0-beta.21"
   },
diff --git a/examples/solid/solid-start-streaming/package.json b/examples/solid/solid-start-streaming/package.json
index 737f9790c3..e454323b17 100644
--- a/examples/solid/solid-start-streaming/package.json
+++ b/examples/solid/solid-start-streaming/package.json
@@ -12,8 +12,8 @@
     "@solidjs/meta": "^0.29.4",
     "@solidjs/router": "^0.15.3",
     "@solidjs/start": "^1.1.3",
-    "@tanstack/solid-query": "^6.0.0-beta.5",
-    "@tanstack/solid-query-devtools": "^6.0.0-beta.5",
+    "@tanstack/solid-query": "^6.0.0-beta.6",
+    "@tanstack/solid-query-devtools": "^6.0.0-beta.6",
     "@solidjs/web": "2.0.0-beta.21",
     "solid-js": "2.0.0-beta.21",
     "vinxi": "^0.5.3"
diff --git a/packages/solid-query-devtools/CHANGELOG.md b/packages/solid-query-devtools/CHANGELOG.md
index 03e996d631..39b6f05cf8 100644
--- a/packages/solid-query-devtools/CHANGELOG.md
+++ b/packages/solid-query-devtools/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @tanstack/solid-query-devtools
 
+## 6.0.0-beta.6
+
+### Patch Changes
+
+- [#11092](https://github.com/TanStack/query/pull/11092) [`dafe806`](https://github.com/TanStack/query/commit/dafe8066381d1ac5332b766c2dfb364d2375b666) - chore: upgrade to solid v2 beta 21
+
+- Updated dependencies [[`dafe806`](https://github.com/TanStack/query/commit/dafe8066381d1ac5332b766c2dfb364d2375b666)]:
+  - @tanstack/solid-query@6.0.0-beta.6
+
 ## 6.0.0-beta.5
 
 ### Patch Changes
diff --git a/packages/solid-query-devtools/package.json b/packages/solid-query-devtools/package.json
index e6d4c41051..e9b1a1880c 100644
--- a/packages/solid-query-devtools/package.json
+++ b/packages/solid-query-devtools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-query-devtools",
-  "version": "6.0.0-beta.5",
+  "version": "6.0.0-beta.6",
   "description": "Developer tools to interact with and visualize the TanStack/solid-query Query cache",
   "author": "tannerlinsley",
   "license": "MIT",
diff --git a/packages/solid-query-persist-client/CHANGELOG.md b/packages/solid-query-persist-client/CHANGELOG.md
index e23b7449e7..fdc8fef629 100644
--- a/packages/solid-query-persist-client/CHANGELOG.md
+++ b/packages/solid-query-persist-client/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @tanstack/solid-query-persist-client
 
+## 6.0.0-beta.6
+
+### Patch Changes
+
+- [#11092](https://github.com/TanStack/query/pull/11092) [`dafe806`](https://github.com/TanStack/query/commit/dafe8066381d1ac5332b766c2dfb364d2375b666) - chore: upgrade to solid v2 beta 21
+
+- Updated dependencies [[`dafe806`](https://github.com/TanStack/query/commit/dafe8066381d1ac5332b766c2dfb364d2375b666)]:
+  - @tanstack/solid-query@6.0.0-beta.6
+
 ## 6.0.0-beta.5
 
 ### Patch Changes
diff --git a/packages/solid-query-persist-client/package.json b/packages/solid-query-persist-client/package.json
index 3329ebdc56..ffc00db8e5 100644
--- a/packages/solid-query-persist-client/package.json
+++ b/packages/solid-query-persist-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-query-persist-client",
-  "version": "6.0.0-beta.5",
+  "version": "6.0.0-beta.6",
   "description": "Solid.js bindings to work with persisters in TanStack/solid-query",
   "author": "tannerlinsley",
   "license": "MIT",
diff --git a/packages/solid-query/CHANGELOG.md b/packages/solid-query/CHANGELOG.md
index 3347cf58be..fe5c0d8bbf 100644
--- a/packages/solid-query/CHANGELOG.md
+++ b/packages/solid-query/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @tanstack/solid-query
 
+## 6.0.0-beta.6
+
+### Patch Changes
+
+- [#11092](https://github.com/TanStack/query/pull/11092) [`dafe806`](https://github.com/TanStack/query/commit/dafe8066381d1ac5332b766c2dfb364d2375b666) - chore: upgrade to solid v2 beta 21
+
 ## 6.0.0-beta.5
 
 ### Patch Changes
diff --git a/packages/solid-query/package.json b/packages/solid-query/package.json
index 140eaf358c..dc265a3fa8 100644
--- a/packages/solid-query/package.json
+++ b/packages/solid-query/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-query",
-  "version": "6.0.0-beta.5",
+  "version": "6.0.0-beta.6",
   "description": "Primitives for managing, caching and syncing asynchronous and remote data in Solid",
   "author": "tannerlinsley",
   "license": "MIT",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6fb1def3fe..2a0a1f3d36 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1601,10 +1601,10 @@ importers:
         specifier: 2.0.0-beta.21
         version: 2.0.0-beta.21(solid-js@2.0.0-beta.21)
       '@tanstack/solid-query':
-        specifier: ^6.0.0-beta.5
+        specifier: ^6.0.0-beta.6
         version: link:../../../packages/solid-query
       '@tanstack/solid-query-devtools':
-        specifier: ^6.0.0-beta.5
+        specifier: ^6.0.0-beta.6
         version: link:../../../packages/solid-query-devtools
       astro:
         specifier: ^5.5.6
@@ -1625,10 +1625,10 @@ importers:
         specifier: 2.0.0-beta.21
         version: 2.0.0-beta.21(solid-js@2.0.0-beta.21)
       '@tanstack/solid-query':
-        specifier: ^6.0.0-beta.5
+        specifier: ^6.0.0-beta.6
         version: link:../../../packages/solid-query
       '@tanstack/solid-query-devtools':
-        specifier: ^6.0.0-beta.5
+        specifier: ^6.0.0-beta.6
         version: link:../../../packages/solid-query-devtools
       solid-js:
         specifier: 2.0.0-beta.21
@@ -1650,10 +1650,10 @@ importers:
         specifier: 2.0.0-beta.21
         version: 2.0.0-beta.21(solid-js@2.0.0-beta.21)
       '@tanstack/solid-query':
-        specifier: ^6.0.0-beta.5
+        specifier: ^6.0.0-beta.6
         version: link:../../../packages/solid-query
       '@tanstack/solid-query-devtools':
-        specifier: ^6.0.0-beta.5
+        specifier: ^6.0.0-beta.6
         version: link:../../../packages/solid-query-devtools
       graphql:
         specifier: ^16.9.0
@@ -1681,10 +1681,10 @@ importers:
         specifier: 2.0.0-beta.21
         version: 2.0.0-beta.21(solid-js@2.0.0-beta.21)
       '@tanstack/solid-query':
-        specifier: ^6.0.0-beta.5
+        specifier: ^6.0.0-beta.6
         version: link:../../../packages/solid-query
       '@tanstack/solid-query-devtools':
-        specifier: ^6.0.0-beta.5
+        specifier: ^6.0.0-beta.6
         version: link:../../../packages/solid-query-devtools
       solid-js:
         specifier: 2.0.0-beta.21
@@ -1709,13 +1709,13 @@ importers:
         specifier: ^5.101.0
         version: link:../../../packages/query-async-storage-persister
       '@tanstack/solid-query':
-        specifier: ^6.0.0-beta.5
+        specifier: ^6.0.0-beta.6
         version: link:../../../packages/solid-query
       '@tanstack/solid-query-devtools':
-        specifier: ^6.0.0-beta.5
+        specifier: ^6.0.0-beta.6
         version: link:../../../packages/solid-query-devtools
       '@tanstack/solid-query-persist-client':
-        specifier: ^6.0.0-beta.5
+        specifier: ^6.0.0-beta.6
         version: link:../../../packages/solid-query-persist-client
       msw:
         specifier: ^2.6.6
@@ -1740,10 +1740,10 @@ importers:
         specifier: 2.0.0-beta.21
         version: 2.0.0-beta.21(solid-js@2.0.0-beta.21)
       '@tanstack/solid-query':
-        specifier: ^6.0.0-beta.5
+        specifier: ^6.0.0-beta.6
         version: link:../../../packages/solid-query
       '@tanstack/solid-query-devtools':
-        specifier: ^6.0.0-beta.5
+        specifier: ^6.0.0-beta.6
         version: link:../../../packages/solid-query-devtools
       solid-js:
         specifier: 2.0.0-beta.21
@@ -1777,10 +1777,10 @@ importers:
         specifier: 2.0.0-beta.21
         version: 2.0.0-beta.21(solid-js@2.0.0-beta.21)
       '@tanstack/solid-query':
-        specifier: ^6.0.0-beta.5
+        specifier: ^6.0.0-beta.6
         version: link:../../../packages/solid-query
       '@tanstack/solid-query-devtools':
-        specifier: ^6.0.0-beta.5
+        specifier: ^6.0.0-beta.6
         version: link:../../../packages/solid-query-devtools
       solid-js:
         specifier: 2.0.0-beta.21