diff --git a/core/modules/views/src/Entity/Render/EntityFieldRenderer.php b/core/modules/views/src/Entity/Render/EntityFieldRenderer.php
index d19e105..68133c8 100644
--- a/core/modules/views/src/Entity/Render/EntityFieldRenderer.php
+++ b/core/modules/views/src/Entity/Render/EntityFieldRenderer.php
@@ -221,22 +221,21 @@ public function render(ResultRow $row, Field $field = NULL) {
       $this->buildFields($this->view->result);
     }
 
+    $build = [];
     if (isset($field)) {
       $field_id = $field->options['id'];
-      if (!isset($this->build[$row->index][$field_id])) {
-        $this->buildFields([$row]);
+      if (isset($this->build[$row->index][$field_id])) {
+        $build = $this->build[$row->index][$field_id];
+        // Free static cache to save memory.
+        unset($this->build[$row->index][$field_id]);
       }
-      $build = $this->build[$row->index][$field_id];
-      // Free static cache to save memory.
-      unset($this->build[$row->index][$field_id]);
     }
     else {
-      if (!isset($this->build[$row->index])) {
-        $this->buildFields([$row]);
+      if (isset($this->build[$row->index])) {
+        $build = $this->build[$row->index];
+        // Free static cache to save memory.
+        unset($this->build[$row->index]);
       }
-      $build = $this->build[$row->index];
-      // Free static cache to save memory.
-      unset($this->build[$row->index]);
     }
 
     return $build;