diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts
index 03cb620468203..c37d238582047 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts
@@ -33,6 +33,7 @@ import {
   FormulaIndexPatternColumn,
   RangeIndexPatternColumn,
   FiltersIndexPatternColumn,
+  PercentileIndexPatternColumn,
 } from './operations';
 import { createMockedFullReference } from './operations/mocks';
 import { cloneDeep } from 'lodash';
@@ -948,6 +949,66 @@ describe('IndexPattern Data Source', () => {
       expect(ast.chain[1].arguments.timeFields).not.toContain('timefield');
     });
 
+    it('should call optimizeEsAggs once per operation for which it is available', () => {
+      const queryBaseState: DataViewBaseState = {
+        currentIndexPatternId: '1',
+        layers: {
+          first: {
+            indexPatternId: '1',
+            columns: {
+              col1: {
+                label: 'timestamp',
+                dataType: 'date',
+                operationType: 'date_histogram',
+                sourceField: 'timestamp',
+                isBucketed: true,
+                scale: 'interval',
+                params: {
+                  interval: 'auto',
+                  includeEmptyRows: true,
+                  dropPartials: false,
+                },
+              } as DateHistogramIndexPatternColumn,
+              col2: {
+                label: '95th percentile of bytes',
+                dataType: 'number',
+                operationType: 'percentile',
+                sourceField: 'bytes',
+                isBucketed: false,
+                scale: 'ratio',
+                params: {
+                  percentile: 95,
+                },
+              } as PercentileIndexPatternColumn,
+              col3: {
+                label: '95th percentile of bytes',
+                dataType: 'number',
+                operationType: 'percentile',
+                sourceField: 'bytes',
+                isBucketed: false,
+                scale: 'ratio',
+                params: {
+                  percentile: 95,
+                },
+              } as PercentileIndexPatternColumn,
+            },
+            columnOrder: ['col1', 'col2', 'col3'],
+            incompleteColumns: {},
+          },
+        },
+      };
+
+      const state = enrichBaseState(queryBaseState);
+
+      const optimizeMock = jest.spyOn(operationDefinitionMap.percentile, 'optimizeEsAggs');
+
+      indexPatternDatasource.toExpression(state, 'first');
+
+      expect(operationDefinitionMap.percentile.optimizeEsAggs).toHaveBeenCalledTimes(1);
+
+      optimizeMock.mockRestore();
+    });
+
     describe('references', () => {
       beforeEach(() => {
         // @ts-expect-error we are inserting an invalid type