diff --git a/src/plugins/discover/public/application/angular/discover.js b/src/plugins/discover/public/application/angular/discover.js
index ff19935cb5532d..584d85cfa3d3f2 100644
--- a/src/plugins/discover/public/application/angular/discover.js
+++ b/src/plugins/discover/public/application/angular/discover.js
@@ -949,7 +949,14 @@ function discoverController($element, $route, $scope, $timeout, $window, Promise
   $scope.updateDataSource = () => {
     const { indexPattern, searchSource } = $scope;
     const indexPatternFields = indexPattern.getComputedFields();
-    const fields = [...$scope.state.columns, ...indexPatternFields.docvalueFields];
+    const columns = $scope.state.columns.filter((name) => {
+      return !indexPatternFields.docvalueFields.find((docVal) => docVal.field === name);
+    });
+    const fields = [
+      ...columns,
+      ...indexPatternFields.docvalueFields,
+      ...Object.keys(indexPatternFields.scriptFields),
+    ];
     searchSource
       .setField('index', $scope.indexPattern)
       .setField('fields', fields)