diff --git a/core/lib/Drupal/Core/Entity/FieldableDatabaseStorageController.php b/core/lib/Drupal/Core/Entity/FieldableDatabaseStorageController.php
index 987427d..353aab0 100644
--- a/core/lib/Drupal/Core/Entity/FieldableDatabaseStorageController.php
+++ b/core/lib/Drupal/Core/Entity/FieldableDatabaseStorageController.php
@@ -869,7 +869,9 @@ protected function doLoadFieldItems($entities, $age) {
       foreach ($results as $row) {
         // Ensure that records for non-translatable fields having invalid
         // languages are skipped.
-        if ($translatable || $row->langcode == $entities[$row->entity_id]->getUntranslated()->language()->id) {
+        // @todo Remove BC support for 'und' untransltable fields as soon as can
+        //   write a migration for them.
+        if ($translatable || $row->langcode == Language::LANGCODE_NOT_SPECIFIED || $row->langcode == $entities[$row->entity_id]->getUntranslated()->language()->id) {
           if (!isset($delta_count[$row->entity_id][$row->langcode])) {
             $delta_count[$row->entity_id][$row->langcode] = 0;
           }