diff --git a/core/lib/Drupal/Core/Config/StorageComparer.php b/core/lib/Drupal/Core/Config/StorageComparer.php
index 0b5c3cd..1a3e0ca 100644
--- a/core/lib/Drupal/Core/Config/StorageComparer.php
+++ b/core/lib/Drupal/Core/Config/StorageComparer.php
@@ -206,21 +206,13 @@ protected function addChangelistUpdate() {
   protected function addChangelistRename() {
     // Renames will be present in both create and delete lists.
     $create_uuids = array();
-    $create_data = array_diff($this->sourceNames, $this->targetNames);
-    if (empty($create_data)) {
-      return;
-    }
-    foreach ($this->getSourceStorage()->readMultiple($create_data) as $create_id => $data) {
+    foreach ($this->getSourceStorage()->readMultiple(array_diff($this->sourceNames, $this->targetNames)) as $create_id => $data) {
       if (isset($data['uuid'])) {
         $create_uuids[$data['uuid']] = $create_id;
       }
     }
-    $delete_data = array_diff($this->targetNames, $this->sourceNames);
-    if (empty($create_uuids) || empty($delete_data)) {
-      return;
-    }
     $renames = array();
-    foreach ($this->getTargetStorage()->readMultiple($delete_data) as $delete_id => $data) {
+    foreach ($this->getTargetStorage()->readMultiple(array_diff($this->targetNames, $this->sourceNames)) as $delete_id => $data) {
       if (isset($data['uuid']) && isset($create_uuids[$data['uuid']])) {
         $renames[] = $delete_id . '::' . $create_uuids[$data['uuid']];