diff --git a/core/lib/Drupal/Core/Entity/EntityStorageBase.php b/core/lib/Drupal/Core/Entity/EntityStorageBase.php
index 19d35cf20f..a6ba4084ae 100644
--- a/core/lib/Drupal/Core/Entity/EntityStorageBase.php
+++ b/core/lib/Drupal/Core/Entity/EntityStorageBase.php
@@ -367,12 +367,12 @@ protected function postLoad(array &$entities) {
     $entity_classes = [];
 
     /** @var \Drupal\Core\Entity\EntityInterface $entity */
-    foreach ($entities as $id => $entity) {
+    foreach ($entities as $id => &$entity) {
       $entity_class = get_class($entity);
       if (!isset($entity_classes[$entity_class])) {
         $entity_classes[$entity_class] = [];
       }
-      $entity_classes[$entity_class][$id] = $entity;
+      $entity_classes[$entity_class][$id] = &$entity;
     }
 
     foreach ($entity_classes as $entity_class => &$items) {