diff --git a/core/lib/Drupal/Core/Entity/DatabaseStorageController.php b/core/lib/Drupal/Core/Entity/DatabaseStorageController.php
index 2336734..df83610 100644
--- a/core/lib/Drupal/Core/Entity/DatabaseStorageController.php
+++ b/core/lib/Drupal/Core/Entity/DatabaseStorageController.php
@@ -578,9 +578,9 @@ protected function doLoadFieldItems($entities, $age) {
       $results = $this->database->select($table, 't')
         ->fields('t')
         ->condition($load_current ? 'entity_id' : 'revision_id', $ids, 'IN')
-        ->orderBy('delta')
         ->condition('deleted', 0)
         ->condition('langcode', $langcodes, 'IN')
+        ->orderBy('delta')
         ->execute();
 
       $delta_count = array();
@@ -662,7 +662,7 @@ protected function doSaveFieldItems(EntityInterface $entity, $update) {
             'revision_id' => $vid,
             'bundle' => $bundle,
             'delta' => $delta,
-            'langcode' => $langcode,
+            'langcode' => $field['translatable'] ? $langcode : Language::LANGCODE_NOT_SPECIFIED,
           );
           foreach ($field['columns'] as $column => $attributes) {
             $column_name = static::_fieldColumnName($field, $column);