diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
index 3905b48..04e9c7e 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
@@ -348,9 +348,6 @@ public function save(EntityInterface $entity) {
       $config->save();
       $entity->postSave($this, TRUE);
       $this->invokeHook('update', $entity);
-
-      // Immediately update the original ID.
-      $entity->setOriginalId($entity->id());
     }
     else {
       $return = SAVED_NEW;
@@ -360,6 +357,9 @@ public function save(EntityInterface $entity) {
       $this->invokeHook('insert', $entity);
     }
 
+    // Immediately update the original ID.
+    $entity->setOriginalId($entity->id());
+
     unset($entity->original);
 
     return $return;