diff --git a/core/modules/views/src/Plugin/views/field/EntityField.php b/core/modules/views/src/Plugin/views/field/EntityField.php
index d697d52031..9337bd76f6 100644
--- a/core/modules/views/src/Plugin/views/field/EntityField.php
+++ b/core/modules/views/src/Plugin/views/field/EntityField.php
@@ -684,7 +684,12 @@ public function submitGroupByForm(&$form, FormStateInterface $form_state) {
 
     // Add settings for "field API" fields.
     $item['group_column'] = $form_state->getValue(['options', 'group_column']);
-    $item['group_columns'] = array_filter($form_state->getValue(['options', 'group_columns']));
+
+    $item['group_columns'] = NULL;
+    if (is_array($form_state->getValue(['options', 'group_columns']))) {
+      $item['group_columns'] = array_filter($form_state->getValue(['options', 'group_columns']));
+    }
+
   }
 
   /**