diff --git a/packages/pglite-react/src/hooks.ts b/packages/pglite-react/src/hooks.ts
index 73d9ced6..92f29855 100644
--- a/packages/pglite-react/src/hooks.ts
+++ b/packages/pglite-react/src/hooks.ts
@@ -18,7 +18,11 @@ function paramsEqual(
 }
 
 function useLiveQueryImpl<T = { [key: string]: unknown }>(
-  query: string | LiveQuery<T> | Promise<LiveQuery<T>>,
+  query:
+    | string
+    | LiveQuery<T>
+    | Promise<LiveQuery<T>>
+    | (() => Promise<string | LiveQuery<T>>),
   params: unknown[] | undefined | null,
   key?: string,
 ): Omit<LiveQueryResults<T>, 'affectedRows'> | undefined {
@@ -27,7 +31,11 @@ function useLiveQueryImpl<T = { [key: string]: unknown }>(
   const liveQueryRef = useRef<LiveQuery<T> | undefined>()
   let liveQuery: LiveQuery<T> | undefined
   let liveQueryChanged = false
-  if (!(typeof query === 'string') && !(query instanceof Promise)) {
+  if (
+    !(typeof query === 'string') &&
+    !(typeof query === 'function') &&
+    !(query instanceof Promise)
+  ) {
     liveQuery = query
     liveQueryChanged = liveQueryRef.current !== liveQuery
     liveQueryRef.current = liveQuery
@@ -49,6 +57,7 @@ function useLiveQueryImpl<T = { [key: string]: unknown }>(
       if (cancelled) return
       setResults(results)
     }
+
     if (typeof query === 'string') {
       const ret =
         key !== undefined
@@ -66,6 +75,30 @@ function useLiveQueryImpl<T = { [key: string]: unknown }>(
         setResults(liveQuery.initialResults)
         liveQuery.subscribe(cb)
       })
+
+      return () => {
+        cancelled = true
+        liveQueryRef.current?.unsubscribe(cb)
+      }
+    } else if (typeof query === 'function') {
+      query().then((liveQueryOrString) => {
+        if (cancelled) return
+        const liveQuery =
+          typeof liveQueryOrString === 'string'
+            ? key !== undefined
+              ? db.live.incrementalQuery<T>(
+                  liveQueryOrString,
+                  currentParams,
+                  key,
+                  cb,
+                )
+              : db.live.query<T>(liveQueryOrString, currentParams, cb)
+            : liveQueryOrString
+        liveQueryRef.current = liveQuery
+        setResults(liveQuery.initialResults)
+        liveQuery.subscribe(cb)
+      })
+
       return () => {
         cancelled = true
         liveQueryRef.current?.unsubscribe(cb)
@@ -73,6 +106,7 @@ function useLiveQueryImpl<T = { [key: string]: unknown }>(
     } else if (liveQuery) {
       setResults(liveQuery.initialResults)
       liveQuery.subscribe(cb)
+
       return () => {
         cancelled = true
         liveQuery.unsubscribe(cb)
@@ -112,7 +146,15 @@ export function useLiveQuery<T = { [key: string]: unknown }>(
 ): LiveQueryResults<T> | undefined
 
 export function useLiveQuery<T = { [key: string]: unknown }>(
-  query: string | LiveQuery<T> | Promise<LiveQuery<T>>,
+  liveQueryPromise: () => Promise<string | LiveQuery<T>>,
+): LiveQueryResults<T> | undefined
+
+export function useLiveQuery<T = { [key: string]: unknown }>(
+  query:
+    | string
+    | LiveQuery<T>
+    | Promise<LiveQuery<T>>
+    | (() => Promise<string | LiveQuery<T>>),
   params?: unknown[] | null,
 ): LiveQueryResults<T> | undefined {
   return useLiveQueryImpl<T>(query, params)