diff --cc core/lib/Drupal/Core/Entity/ContentEntityBase.php
index 7c0a458,4eb2a87..0000000
--- a/core/lib/Drupal/Core/Entity/ContentEntityBase.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityBase.php
@@@ -368,6 -376,31 +387,19 @@@ abstract class ContentEntityBase extend
    /**
     * {@inheritdoc}
     */
+   public function postSave(EntityStorageInterface $storage, $update = TRUE) {
+     parent::postSave($storage, $update);
+ 
 -    // Update the status of all saved translations.
 -    $removed = [];
 -    foreach ($this->translations as $langcode => &$data) {
 -      if ($data['status'] == static::TRANSLATION_REMOVED) {
 -        $removed[$langcode] = TRUE;
 -      }
 -      else {
 -        $data['status'] = static::TRANSLATION_EXISTING;
 -      }
 -    }
 -    $this->translations = array_diff_key($this->translations, $removed);
 -
+     // If there is an revision ID set it as the original revision ID. Even when
+     // a new revision isn't created the original ID should be set.
+     if ($this->getRevisionId()) {
+       $this->originalRevisionId = $this->getRevisionId();
+     }
+   }
+ 
+   /**
+    * {@inheritdoc}
+    */
    public function validate() {
      $this->validated = TRUE;
      $violations = $this->getTypedData()->validate();