diff --git a/core/lib/Drupal/Core/Entity/FieldableDatabaseStorageController.php b/core/lib/Drupal/Core/Entity/FieldableDatabaseStorageController.php
index cc1296c..dbfc5c1 100644
--- a/core/lib/Drupal/Core/Entity/FieldableDatabaseStorageController.php
+++ b/core/lib/Drupal/Core/Entity/FieldableDatabaseStorageController.php
@@ -303,12 +303,10 @@ protected function loadMultipleFromStorage($ids) {
   }
 
   protected function loadMultipleFromCache(&$ids) {
-    if (!$this->persistentCache) {
+    if (!$this->persistentCache || empty($ids)) {
       return array();
     }
 
-    $ids = !empty($ids) ? $ids : array();
-
     // Load remaining entities from the persistent cache.
     return $this->getFromPersistentCache($ids);
   }