diff --git a/core/lib/Drupal/Core/Entity/EntityDisplayBase.php b/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
index be3cd37..72715a4 100644
--- a/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
+++ b/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
@@ -353,7 +353,8 @@ public function setComponent($name, array $options = array()) {
     }
 
     // Ensure we always have an empty settings and array.
-    $options += ['settings' => [], 'third_party_settings' => []];
+    // @TODO, is this the right place to ensure label is set?
+    $options += ['label' => '', 'settings' => [], 'third_party_settings' => []];
 
     $this->content[$name] = $options;
     unset($this->hidden[$name]);
diff --git a/core/modules/views/src/Entity/Render/EntityFieldRenderer.php b/core/modules/views/src/Entity/Render/EntityFieldRenderer.php
index 1b05c1b..353f335 100644
--- a/core/modules/views/src/Entity/Render/EntityFieldRenderer.php
+++ b/core/modules/views/src/Entity/Render/EntityFieldRenderer.php
@@ -232,6 +232,7 @@ protected function buildFields(array $values) {
             $display->setComponent($field->definition['field_name'], [
               'type' => $field->options['type'],
               'settings' => $field->options['settings'],
+              'label' => $field->label(),
             ]);
           }
           // Let the display build the render array for the entities.