diff --git a/.changeset/pre.json b/.changeset/pre.json
index 4db0fd9b..50f6ad65 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -47,6 +47,7 @@
     "remove-legacy-apis",
     "renumber-next-line-two-x",
     "require-solid-beta-22",
+    "require-solid-rc-6",
     "response-stub-committed-type",
     "retry-failed-lazy-subtrees",
     "router-factory-typed-paths",
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a0959f4..87b9348e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @solidjs/router
 
+## 2.0.0-next.22
+
+### Patch Changes
+
+- 720f98c: Require solid-js 2.0.0-rc.6: earlier rcs wedge navigation forever when a lazy route reads a query gated behind another still-pending query (#595, fixed in core by solidjs/solid#3226). Adds a regression spec covering the gated-query navigation shape.
+
 ## 2.0.0-next.21
 
 ### Patch Changes
diff --git a/package.json b/package.json
index 49f20417..509639b8 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
     "Ryan Turnquist"
   ],
   "license": "MIT",
-  "version": "2.0.0-next.21",
+  "version": "2.0.0-next.22",
   "homepage": "https://github.com/solidjs/solid-router#readme",
   "repository": {
     "type": "git",