diff --git a/packages/plugin/src/Elements/Db/EventQuery.php b/packages/plugin/src/Elements/Db/EventQuery.php
index f98c9f98..44afc813 100644
--- a/packages/plugin/src/Elements/Db/EventQuery.php
+++ b/packages/plugin/src/Elements/Db/EventQuery.php
@@ -487,13 +487,16 @@ public function all($db = null): array
         if (null === $this->events || self::$lastCachedConfigStateHash !== $configHash) {
             $limit = $this->limit;
             $offset = $this->offset;
+            $indexBy = $this->indexBy;
             $this->limit = null;
             $this->offset = null;
+            $this->indexBy = null;
 
             $ids = parent::ids($db);
 
             $this->limit = $limit;
             $this->offset = $offset;
+            $this->indexBy = $indexBy;
 
             if (empty($ids)) {
                 return [];