diff --git a/datastore/query.nim b/datastore/query.nim
index 295ac83..72e260b 100644
--- a/datastore/query.nim
+++ b/datastore/query.nim
@@ -51,7 +51,7 @@ proc waitForAllQueryResults*(qi: ?!QueryIter): Future[?!seq[QueryResponse]] {.as
 
 proc waitForAllQueryResults*(iter: Future[?!QueryIter]): Future[?!seq[QueryResponse]] {.async.} =
   let res = await iter
-  await waitForAllQueryResults(res)
+  return await waitForAllQueryResults(res)
 
 proc defaultDispose(): Future[?!void] {.upraises: [], gcsafe, async.} =
   return success()
diff --git a/tests/datastore/testdatastore.nim b/tests/datastore/testdatastore.nim
index cd52915..149badc 100644
--- a/tests/datastore/testdatastore.nim
+++ b/tests/datastore/testdatastore.nim
@@ -25,6 +25,9 @@ suite "Datastore (base)":
 
   test "query":
     expect Defect:
-      let iter = tryGet(await waitForAllQueryResults ds.query(Query.init(key)))
-      for n in iter:
+      let 
+        q = Query.init(key)
+        all = waitForAllQueryResults(await ds.query(q))
+        res = tryGet(await all)
+      for n in res:
         discard