diff --git a/core/lib/Drupal/Core/Entity/ContentEntityDatabaseStorage.php b/core/lib/Drupal/Core/Entity/ContentEntityDatabaseStorage.php
index 5769425..61c3ab9 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityDatabaseStorage.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityDatabaseStorage.php
@@ -1018,7 +1018,9 @@ protected function mapToStorageRecord(ContentEntityInterface $entity, $table_nam
           if (isset($value) || !$is_new) {
             $info = isset($schema['fields'][$name]) ? $schema['fields'][$name] : $definition->getSchema()['columns'][$column];
             list(, $storage_column) = each($storage_columns);
-            $record->$storage_column = drupal_schema_get_field_value($info, $value);
+            if (!empty($storage_column)) {
+              $record->$storage_column = drupal_schema_get_field_value($info, $value);
+            }
           }
         }
       }