diff --git a/docs/guides/edge.md b/docs/guides/edge.md
index 72f87c8e..00e00e0d 100644
--- a/docs/guides/edge.md
+++ b/docs/guides/edge.md
@@ -123,4 +123,5 @@ export default {
 Cloudflare's [D1 database](https://developers.cloudflare.com/d1/) is not yet supported by ZenStack due to its lack of support for interactive transactions.
 :::
 
-ZenStack currently doesn't have adapters for edge-first server frameworks like [hono](https://hono.dev/). Please create a [feature request](https://github.com/zenstackhq/zenstack/issues/new?template=feature_request.md&title=%5BFeature+Request%5D) if you have a need for it.
+If you need a more sophisticated backend running on Cloudflare Workers, [Hono](https://hono.dev/) is a great choice. Check [how you can use ZenStack with Hono](https://zenstack.dev/docs/reference/server-adapters/hono).
+```
\ No newline at end of file
diff --git a/docs/reference/plugins/tanstack-query.mdx b/docs/reference/plugins/tanstack-query.mdx
index 2aa265f0..79508b27 100644
--- a/docs/reference/plugins/tanstack-query.mdx
+++ b/docs/reference/plugins/tanstack-query.mdx
@@ -677,3 +677,15 @@ will be:
 ```
 
 You can use the generated `getQueryKey` function to compute it.
+
+## FAQ
+
+### Next.js error "createContext" is not a function
+
+If you see an error like:
+
+```plain
+Error in Next.js: "TypeError: (0 , react__WEBPACK_IMPORTED_MODULE_0__.createContext) is not a function"
+```
+
+It's usually due to you're using the hooks in a React server component. Make sure to add the `'use client;'` directive at the top of your component file.