diff --git a/core/lib/Drupal/Core/Entity/ContentEntityBase.php b/core/lib/Drupal/Core/Entity/ContentEntityBase.php
index 36c3a0ba25..8811a73715 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityBase.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityBase.php
@@ -516,7 +516,10 @@ public function preSave(EntityStorageInterface $storage) {
 
     // Set the parent revision ID automatically when we create a new revision.
     if ($this->isNewRevision() && !$this->enforceRevisionParent) {
-      $this->setParentRevisionId($this->getLoadedRevisionId());
+      // By default, the parent revision is the active revision of the branch.
+      // @todo Use the active revision ID once it is available.
+      //   @see https://www.drupal.org/project/drupal/issues/3023194
+      $this->setParentRevisionId($storage->getLatestRevisionId($this->id()));
     }
 
     parent::preSave($storage);