diff --git a/packages/plugin/src/Elements/Db/EventQuery.php b/packages/plugin/src/Elements/Db/EventQuery.php
index d7f1d687..d611c541 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 [];
diff --git a/packages/plugin/src/Services/EventsService.php b/packages/plugin/src/Services/EventsService.php
index 5fe31f37..7bedd98b 100644
--- a/packages/plugin/src/Services/EventsService.php
+++ b/packages/plugin/src/Services/EventsService.php
@@ -204,7 +204,7 @@ public function saveEvent(Event $event, bool $validateContent = true, bool $bypa
             $transaction = \Craft::$app->db->beginTransaction();
 
             try {
-                $isSaved = \Craft::$app->elements->saveElement($event, $validateContent);
+                $isSaved = \Craft::$app->elements->saveElement($event, $validateContent, $isNewEvent);
                 if ($isSaved) {
                     $this->reindexSearchForAllSites($event);