diff --git a/src/infrastructure/storage/future/QueryFuture.php b/src/infrastructure/storage/future/QueryFuture.php
index 9878581214..0f1fc3b9d4 100644
--- a/src/infrastructure/storage/future/QueryFuture.php
+++ b/src/infrastructure/storage/future/QueryFuture.php
@@ -51,7 +51,7 @@ final class QueryFuture extends Future {
   }
 
   public function isReady() {
-    if ($this->result !== null || $this->exception) {
+    if ($this->canResolve()) {
       return true;
     }
 
@@ -105,7 +105,7 @@ final class QueryFuture extends Future {
 
     $this->processResults($this->conn->resolveAsyncQueries($conns, $asyncs));
 
-    if ($this->result !== null || $this->exception) {
+    if ($this->canResolve()) {
       return true;
     }
     return false;