From fd2c19dd8c5f2f58c4a92f2abb6a38b7381d9714 Mon Sep 17 00:00:00 2001
From: Julia Rechkunova <julia.rechkunova@elastic.co>
Date: Mon, 16 Oct 2023 17:56:47 +0200
Subject: [PATCH] [Discover] Fix for other setting

---
 .../main/utils/get_switch_data_view_app_state.ts       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/discover/public/application/main/utils/get_switch_data_view_app_state.ts b/src/plugins/discover/public/application/main/utils/get_switch_data_view_app_state.ts
index 3b65cacc7aa8c7..2177fdad1ceabd 100644
--- a/src/plugins/discover/public/application/main/utils/get_switch_data_view_app_state.ts
+++ b/src/plugins/discover/public/application/main/utils/get_switch_data_view_app_state.ts
@@ -25,13 +25,13 @@ export function getDataViewAppState(
   sortDirection: string = 'desc',
   query?: Query | AggregateQuery
 ) {
-  const currentColumnsRefreshed = uniq([...currentColumns, ...defaultColumns]);
+  let columns = currentColumns || [];
 
-  const nextColumns = modifyColumns
-    ? currentColumnsRefreshed.filter((column) => nextDataView.fields.getByName(column))
-    : currentColumnsRefreshed;
+  if (modifyColumns) {
+    const currentColumnsRefreshed = uniq([...columns, ...defaultColumns]);
+    columns = currentColumnsRefreshed.filter((column) => nextDataView.fields.getByName(column));
+  }
 
-  let columns = nextColumns.length ? nextColumns : [];
   if (query && isOfAggregateQueryType(query)) {
     columns = [];
   }