diff --git a/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php b/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php
index dc88c70..00ec15c 100644
--- a/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php
+++ b/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php
@@ -581,10 +581,9 @@ protected function mapToDataStorageRecord(EntityInterface $entity, $langcode) {
 
     $record = new \stdClass();
     foreach ($this->entityInfo['schema_fields_sql']['data_table'] as $name) {
-      if (isset($definitions[$name]) && isset($translation->$name->value)) {
-        $info = $schema['fields'][$name];
-        $record->$name = drupal_schema_get_field_value($info, $translation->$name->value);
-      }
+      $info = $schema['fields'][$name];
+      $value = isset($definitions[$name]) && isset($translation->$name->value) ? $translation->$name->value : NULL;
+      $record->$name = drupal_schema_get_field_value($info, $value);
     }
     $record->langcode = $langcode;
     $record->default_langcode = intval($default_langcode == $langcode);