diff --git a/src/Promise/PromiseMany.php b/src/Promise/PromiseMany.php
index c24fc45c1..791537ecd 100644
--- a/src/Promise/PromiseMany.php
+++ b/src/Promise/PromiseMany.php
@@ -81,7 +81,8 @@ public function __resolve()
         if ($this->query === []) {
             // nothing to proxy to
             $this->orm = null;
-            return null;
+
+            return [];
         }
 
         foreach ($this->orm->getRepository($this->target)->findAll($this->query + $this->where) as $item) {