diff --git a/src/Entity/Storage/ContentEntityStorageTrait.php b/src/Entity/Storage/ContentEntityStorageTrait.php
index 3844550..3dc88fb 100644
--- a/src/Entity/Storage/ContentEntityStorageTrait.php
+++ b/src/Entity/Storage/ContentEntityStorageTrait.php
@@ -157,11 +157,8 @@ trait ContentEntityStorageTrait {
    * {@inheritdoc}
    */
   protected function doPreSave(EntityInterface $entity) {
-    if (!$entity->isNew() && !isset($entity->original) && $entity->originalId) {
-      $entity->original = $this->loadUnchanged($entity->originalId);
-    }
-    elseif (!$entity->isNew() && !isset($entity->original)) {
-      $entity->original = $entity;
+    if (!$entity->isNew() && !isset($entity->original)) {
+      $entity->original = $this->loadUnchanged($entity->originalId ?: $entity->id());
     }
     parent::doPreSave($entity);
   }