diff --git a/src/plugins/chart_expressions/expression_xy/common/index.ts b/src/plugins/chart_expressions/expression_xy/common/index.ts
index 4bee4a3e7f2b6..7211a7a7db1b7 100755
--- a/src/plugins/chart_expressions/expression_xy/common/index.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/index.ts
@@ -29,7 +29,6 @@ export type {
   LegendConfig,
   IconPosition,
   DataLayerArgs,
-  LensMultiTable,
   ValueLabelMode,
   AxisExtentMode,
   DataLayerConfig,
diff --git a/src/plugins/chart_expressions/expression_xy/common/types/expression_functions.ts b/src/plugins/chart_expressions/expression_xy/common/types/expression_functions.ts
index b3c7bca93ca29..c2c21c5814bd2 100644
--- a/src/plugins/chart_expressions/expression_xy/common/types/expression_functions.ts
+++ b/src/plugins/chart_expressions/expression_xy/common/types/expression_functions.ts
@@ -17,7 +17,6 @@ import {
   FittingFunctions,
   IconPositions,
   LayerTypes,
-  MULTITABLE,
   LineStyles,
   SeriesTypes,
   ValueLabelModes,
@@ -296,15 +295,6 @@ export type XYExtendedLayerConfigResult =
   | ExtendedReferenceLineLayerConfigResult
   | ExtendedAnnotationLayerConfigResult;
 
-export interface LensMultiTable {
-  type: typeof MULTITABLE;
-  tables: Record<string, Datatable>;
-  dateRange?: {
-    fromDate: Date;
-    toDate: Date;
-  };
-}
-
 export type ReferenceLineLayerConfigResult = ReferenceLineLayerArgs & {
   type: typeof REFERENCE_LINE_LAYER;
   layerType: typeof LayerTypes.REFERENCELINE;
diff --git a/src/plugins/chart_expressions/expression_xy/public/__mocks__/index.tsx b/src/plugins/chart_expressions/expression_xy/public/__mocks__/index.tsx
index 194bfc2bf5c9d..e84d8c001fb82 100644
--- a/src/plugins/chart_expressions/expression_xy/public/__mocks__/index.tsx
+++ b/src/plugins/chart_expressions/expression_xy/public/__mocks__/index.tsx
@@ -8,7 +8,6 @@
 
 import { Datatable } from '@kbn/expressions-plugin/common';
 import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
-import { LensMultiTable } from '../../common';
 import { LayerTypes } from '../../common/constants';
 import { DataLayerConfig, XYProps } from '../../common/types';
 import { mockPaletteOutput, sampleArgs } from '../../common/__mocks__';
@@ -21,151 +20,142 @@ export const chartsActiveCursorService = chartStartContract.activeCursor;
 
 export const paletteService = chartPluginMock.createPaletteRegistry();
 
-export const dateHistogramData: LensMultiTable = {
-  type: 'lens_multitable',
-  tables: {
-    timeLayer: {
-      type: 'datatable',
-      rows: [
-        {
-          xAccessorId: 1585758120000,
-          splitAccessorId: "Men's Clothing",
-          yAccessorId: 1,
-        },
-        {
-          xAccessorId: 1585758360000,
-          splitAccessorId: "Women's Accessories",
-          yAccessorId: 1,
-        },
-        {
-          xAccessorId: 1585758360000,
-          splitAccessorId: "Women's Clothing",
-          yAccessorId: 1,
-        },
-        {
-          xAccessorId: 1585759380000,
-          splitAccessorId: "Men's Clothing",
-          yAccessorId: 1,
-        },
-        {
-          xAccessorId: 1585759380000,
-          splitAccessorId: "Men's Shoes",
-          yAccessorId: 1,
-        },
-        {
-          xAccessorId: 1585759380000,
-          splitAccessorId: "Women's Clothing",
-          yAccessorId: 1,
-        },
-        {
-          xAccessorId: 1585760700000,
-          splitAccessorId: "Men's Clothing",
-          yAccessorId: 1,
-        },
-        {
-          xAccessorId: 1585760760000,
-          splitAccessorId: "Men's Clothing",
-          yAccessorId: 1,
-        },
-        {
-          xAccessorId: 1585760760000,
-          splitAccessorId: "Men's Shoes",
-          yAccessorId: 1,
-        },
-        {
-          xAccessorId: 1585761120000,
-          splitAccessorId: "Men's Shoes",
-          yAccessorId: 1,
-        },
-      ],
-      columns: [
-        {
-          id: 'xAccessorId',
-          name: 'order_date per minute',
-          meta: {
-            type: 'date',
+export const dateHistogramData: Datatable = {
+  type: 'datatable',
+  rows: [
+    {
+      xAccessorId: 1585758120000,
+      splitAccessorId: "Men's Clothing",
+      yAccessorId: 1,
+    },
+    {
+      xAccessorId: 1585758360000,
+      splitAccessorId: "Women's Accessories",
+      yAccessorId: 1,
+    },
+    {
+      xAccessorId: 1585758360000,
+      splitAccessorId: "Women's Clothing",
+      yAccessorId: 1,
+    },
+    {
+      xAccessorId: 1585759380000,
+      splitAccessorId: "Men's Clothing",
+      yAccessorId: 1,
+    },
+    {
+      xAccessorId: 1585759380000,
+      splitAccessorId: "Men's Shoes",
+      yAccessorId: 1,
+    },
+    {
+      xAccessorId: 1585759380000,
+      splitAccessorId: "Women's Clothing",
+      yAccessorId: 1,
+    },
+    {
+      xAccessorId: 1585760700000,
+      splitAccessorId: "Men's Clothing",
+      yAccessorId: 1,
+    },
+    {
+      xAccessorId: 1585760760000,
+      splitAccessorId: "Men's Clothing",
+      yAccessorId: 1,
+    },
+    {
+      xAccessorId: 1585760760000,
+      splitAccessorId: "Men's Shoes",
+      yAccessorId: 1,
+    },
+    {
+      xAccessorId: 1585761120000,
+      splitAccessorId: "Men's Shoes",
+      yAccessorId: 1,
+    },
+  ],
+  columns: [
+    {
+      id: 'xAccessorId',
+      name: 'order_date per minute',
+      meta: {
+        type: 'date',
+        field: 'order_date',
+        source: 'esaggs',
+        index: 'indexPatternId',
+        sourceParams: {
+          indexPatternId: 'indexPatternId',
+          type: 'date_histogram',
+          appliedTimeRange: {
+            from: '2020-04-01T16:14:16.246Z',
+            to: '2020-04-01T17:15:41.263Z',
+          },
+          params: {
             field: 'order_date',
-            source: 'esaggs',
-            index: 'indexPatternId',
-            sourceParams: {
-              indexPatternId: 'indexPatternId',
-              type: 'date_histogram',
-              appliedTimeRange: {
-                from: '2020-04-01T16:14:16.246Z',
-                to: '2020-04-01T17:15:41.263Z',
-              },
-              params: {
-                field: 'order_date',
-                timeRange: { from: '2020-04-01T16:14:16.246Z', to: '2020-04-01T17:15:41.263Z' },
-                useNormalizedEsInterval: true,
-                scaleMetricValues: false,
-                interval: '1m',
-                drop_partials: false,
-                min_doc_count: 0,
-                extended_bounds: {},
-              },
-            },
-            params: { id: 'date', params: { pattern: 'HH:mm' } },
+            timeRange: { from: '2020-04-01T16:14:16.246Z', to: '2020-04-01T17:15:41.263Z' },
+            useNormalizedEsInterval: true,
+            scaleMetricValues: false,
+            interval: '1m',
+            drop_partials: false,
+            min_doc_count: 0,
+            extended_bounds: {},
           },
         },
-        {
-          id: 'splitAccessorId',
-          name: 'Top values of category.keyword',
-          meta: {
-            type: 'string',
+        params: { id: 'date', params: { pattern: 'HH:mm' } },
+      },
+    },
+    {
+      id: 'splitAccessorId',
+      name: 'Top values of category.keyword',
+      meta: {
+        type: 'string',
+        field: 'category.keyword',
+        source: 'esaggs',
+        index: 'indexPatternId',
+        sourceParams: {
+          indexPatternId: 'indexPatternId',
+          type: 'terms',
+          params: {
             field: 'category.keyword',
-            source: 'esaggs',
-            index: 'indexPatternId',
-            sourceParams: {
-              indexPatternId: 'indexPatternId',
-              type: 'terms',
-              params: {
-                field: 'category.keyword',
-                orderBy: 'yAccessorId',
-                order: 'desc',
-                size: 3,
-                otherBucket: false,
-                otherBucketLabel: 'Other',
-                missingBucket: false,
-                missingBucketLabel: 'Missing',
-              },
-            },
-            params: {
-              id: 'terms',
-              params: {
-                id: 'string',
-                otherBucketLabel: 'Other',
-                missingBucketLabel: 'Missing',
-                parsedUrl: {
-                  origin: 'http://localhost:5601',
-                  pathname: '/jiy/app/kibana',
-                  basePath: '/jiy',
-                },
-              },
-            },
+            orderBy: 'yAccessorId',
+            order: 'desc',
+            size: 3,
+            otherBucket: false,
+            otherBucketLabel: 'Other',
+            missingBucket: false,
+            missingBucketLabel: 'Missing',
           },
         },
-        {
-          id: 'yAccessorId',
-          name: 'Count of records',
-          meta: {
-            type: 'number',
-            source: 'esaggs',
-            index: 'indexPatternId',
-            sourceParams: {
-              indexPatternId: 'indexPatternId',
-              params: {},
+        params: {
+          id: 'terms',
+          params: {
+            id: 'string',
+            otherBucketLabel: 'Other',
+            missingBucketLabel: 'Missing',
+            parsedUrl: {
+              origin: 'http://localhost:5601',
+              pathname: '/jiy/app/kibana',
+              basePath: '/jiy',
             },
-            params: { id: 'number' },
           },
         },
-      ],
+      },
+    },
+    {
+      id: 'yAccessorId',
+      name: 'Count of records',
+      meta: {
+        type: 'number',
+        source: 'esaggs',
+        index: 'indexPatternId',
+        sourceParams: {
+          indexPatternId: 'indexPatternId',
+          params: {},
+        },
+        params: { id: 'number' },
+      },
     },
-  },
-  dateRange: {
-    fromDate: new Date('2020-04-01T16:14:16.246Z'),
-    toDate: new Date('2020-04-01T17:15:41.263Z'),
-  },
+  ],
 };
 
 export const dateHistogramLayer: DataLayerConfig = {
@@ -181,7 +171,7 @@ export const dateHistogramLayer: DataLayerConfig = {
   seriesType: 'bar_stacked',
   accessors: ['yAccessorId'],
   palette: mockPaletteOutput,
-  table: dateHistogramData.tables.timeLayer,
+  table: dateHistogramData,
 };
 
 export function sampleArgsWithReferenceLine(value: number = 150) {
diff --git a/src/plugins/chart_expressions/expression_xy/public/components/legend_action.test.tsx b/src/plugins/chart_expressions/expression_xy/public/components/legend_action.test.tsx
index 7c60a6a3a5769..78ac1ed8d10cf 100644
--- a/src/plugins/chart_expressions/expression_xy/public/components/legend_action.test.tsx
+++ b/src/plugins/chart_expressions/expression_xy/public/components/legend_action.test.tsx
@@ -7,151 +7,150 @@
  */
 
 import React from 'react';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { LegendActionProps, SeriesIdentifier } from '@elastic/charts';
 import { EuiPopover } from '@elastic/eui';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { ComponentType, ReactWrapper } from 'enzyme';
-import type { DataLayerConfig, LensMultiTable } from '../../common';
+import type { DataLayerConfig } from '../../common';
 import { LayerTypes } from '../../common/constants';
 import { getLegendAction } from './legend_action';
 import { LegendActionPopover } from './legend_action_popover';
 import { mockPaletteOutput } from '../../common/__mocks__';
 
-const tables = {
-  first: {
-    type: 'datatable',
-    rows: [
-      {
-        xAccessorId: 1585758120000,
-        splitAccessorId: "Men's Clothing",
-        yAccessorId: 1,
-      },
-      {
-        xAccessorId: 1585758360000,
-        splitAccessorId: "Women's Accessories",
-        yAccessorId: 1,
-      },
-      {
-        xAccessorId: 1585758360000,
-        splitAccessorId: "Women's Clothing",
-        yAccessorId: 1,
-      },
-      {
-        xAccessorId: 1585759380000,
-        splitAccessorId: "Men's Clothing",
-        yAccessorId: 1,
-      },
-      {
-        xAccessorId: 1585759380000,
-        splitAccessorId: "Men's Shoes",
-        yAccessorId: 1,
-      },
-      {
-        xAccessorId: 1585759380000,
-        splitAccessorId: "Women's Clothing",
-        yAccessorId: 1,
-      },
-      {
-        xAccessorId: 1585760700000,
-        splitAccessorId: "Men's Clothing",
-        yAccessorId: 1,
-      },
-      {
-        xAccessorId: 1585760760000,
-        splitAccessorId: "Men's Clothing",
-        yAccessorId: 1,
-      },
-      {
-        xAccessorId: 1585760760000,
-        splitAccessorId: "Men's Shoes",
-        yAccessorId: 1,
-      },
-      {
-        xAccessorId: 1585761120000,
-        splitAccessorId: "Men's Shoes",
-        yAccessorId: 1,
-      },
-    ],
-    columns: [
-      {
-        id: 'xAccessorId',
-        name: 'order_date per minute',
-        meta: {
-          type: 'date',
-          field: 'order_date',
-          source: 'esaggs',
-          index: 'indexPatternId',
-          sourceParams: {
-            indexPatternId: 'indexPatternId',
-            type: 'date_histogram',
-            params: {
-              field: 'order_date',
-              timeRange: { from: '2020-04-01T16:14:16.246Z', to: '2020-04-01T17:15:41.263Z' },
-              useNormalizedEsInterval: true,
-              scaleMetricValues: false,
-              interval: '1m',
-              drop_partials: false,
-              min_doc_count: 0,
-              extended_bounds: {},
-            },
+const table: Datatable = {
+  type: 'datatable',
+  rows: [
+    {
+      xAccessorId: 1585758120000,
+      splitAccessorId: "Men's Clothing",
+      yAccessorId: 1,
+    },
+    {
+      xAccessorId: 1585758360000,
+      splitAccessorId: "Women's Accessories",
+      yAccessorId: 1,
+    },
+    {
+      xAccessorId: 1585758360000,
+      splitAccessorId: "Women's Clothing",
+      yAccessorId: 1,
+    },
+    {
+      xAccessorId: 1585759380000,
+      splitAccessorId: "Men's Clothing",
+      yAccessorId: 1,
+    },
+    {
+      xAccessorId: 1585759380000,
+      splitAccessorId: "Men's Shoes",
+      yAccessorId: 1,
+    },
+    {
+      xAccessorId: 1585759380000,
+      splitAccessorId: "Women's Clothing",
+      yAccessorId: 1,
+    },
+    {
+      xAccessorId: 1585760700000,
+      splitAccessorId: "Men's Clothing",
+      yAccessorId: 1,
+    },
+    {
+      xAccessorId: 1585760760000,
+      splitAccessorId: "Men's Clothing",
+      yAccessorId: 1,
+    },
+    {
+      xAccessorId: 1585760760000,
+      splitAccessorId: "Men's Shoes",
+      yAccessorId: 1,
+    },
+    {
+      xAccessorId: 1585761120000,
+      splitAccessorId: "Men's Shoes",
+      yAccessorId: 1,
+    },
+  ],
+  columns: [
+    {
+      id: 'xAccessorId',
+      name: 'order_date per minute',
+      meta: {
+        type: 'date',
+        field: 'order_date',
+        source: 'esaggs',
+        index: 'indexPatternId',
+        sourceParams: {
+          indexPatternId: 'indexPatternId',
+          type: 'date_histogram',
+          params: {
+            field: 'order_date',
+            timeRange: { from: '2020-04-01T16:14:16.246Z', to: '2020-04-01T17:15:41.263Z' },
+            useNormalizedEsInterval: true,
+            scaleMetricValues: false,
+            interval: '1m',
+            drop_partials: false,
+            min_doc_count: 0,
+            extended_bounds: {},
           },
-          params: { id: 'date', params: { pattern: 'HH:mm' } },
         },
+        params: { id: 'date', params: { pattern: 'HH:mm' } },
       },
-      {
-        id: 'splitAccessorId',
-        name: 'Top values of category.keyword',
-        meta: {
-          type: 'string',
-          field: 'category.keyword',
-          source: 'esaggs',
-          index: 'indexPatternId',
-          sourceParams: {
-            indexPatternId: 'indexPatternId',
-            type: 'terms',
-            params: {
-              field: 'category.keyword',
-              orderBy: 'yAccessorId',
-              order: 'desc',
-              size: 3,
-              otherBucket: false,
-              otherBucketLabel: 'Other',
-              missingBucket: false,
-              missingBucketLabel: 'Missing',
-            },
+    },
+    {
+      id: 'splitAccessorId',
+      name: 'Top values of category.keyword',
+      meta: {
+        type: 'string',
+        field: 'category.keyword',
+        source: 'esaggs',
+        index: 'indexPatternId',
+        sourceParams: {
+          indexPatternId: 'indexPatternId',
+          type: 'terms',
+          params: {
+            field: 'category.keyword',
+            orderBy: 'yAccessorId',
+            order: 'desc',
+            size: 3,
+            otherBucket: false,
+            otherBucketLabel: 'Other',
+            missingBucket: false,
+            missingBucketLabel: 'Missing',
           },
+        },
+        params: {
+          id: 'terms',
           params: {
-            id: 'terms',
-            params: {
-              id: 'string',
-              otherBucketLabel: 'Other',
-              missingBucketLabel: 'Missing',
-              parsedUrl: {
-                origin: 'http://localhost:5601',
-                pathname: '/jiy/app/kibana',
-                basePath: '/jiy',
-              },
+            id: 'string',
+            otherBucketLabel: 'Other',
+            missingBucketLabel: 'Missing',
+            parsedUrl: {
+              origin: 'http://localhost:5601',
+              pathname: '/jiy/app/kibana',
+              basePath: '/jiy',
             },
           },
         },
       },
-      {
-        id: 'yAccessorId',
-        name: 'Count of records',
-        meta: {
-          type: 'number',
-          source: 'esaggs',
-          index: 'indexPatternId',
-          sourceParams: {
-            indexPatternId: 'indexPatternId',
-            params: {},
-          },
-          params: { id: 'number' },
+    },
+    {
+      id: 'yAccessorId',
+      name: 'Count of records',
+      meta: {
+        type: 'number',
+        source: 'esaggs',
+        index: 'indexPatternId',
+        sourceParams: {
+          indexPatternId: 'indexPatternId',
+          params: {},
         },
+        params: { id: 'number' },
       },
-    ],
-  },
-} as LensMultiTable['tables'];
+    },
+  ],
+};
 
 const sampleLayer: DataLayerConfig = {
   layerId: 'first',
@@ -166,7 +165,7 @@ const sampleLayer: DataLayerConfig = {
   yScaleType: 'linear',
   isHistogram: false,
   palette: mockPaletteOutput,
-  table: tables.first,
+  table,
 };
 
 describe('getLegendAction', function () {
@@ -228,7 +227,7 @@ describe('getLegendAction', function () {
         {
           column: 1,
           row: 1,
-          table: tables.first,
+          table,
           value: "Women's Accessories",
         },
       ],
diff --git a/src/plugins/chart_expressions/expression_xy/public/components/xy_chart.test.tsx b/src/plugins/chart_expressions/expression_xy/public/components/xy_chart.test.tsx
index de67e814d5b78..758a71a08258c 100644
--- a/src/plugins/chart_expressions/expression_xy/public/components/xy_chart.test.tsx
+++ b/src/plugins/chart_expressions/expression_xy/public/components/xy_chart.test.tsx
@@ -772,7 +772,7 @@ describe('XYChart component', () => {
 
     expect(onSelectRange).toHaveBeenCalledWith({
       column: 0,
-      table: dateHistogramData.tables.timeLayer,
+      table: dateHistogramData,
       range: [1585757732783, 1585758880838],
     });
   });
@@ -968,7 +968,7 @@ describe('XYChart component', () => {
         {
           column: 0,
           row: 0,
-          table: dateHistogramData.tables.timeLayer,
+          table: dateHistogramData,
           value: 1585758120000,
         },
       ],
diff --git a/x-pack/plugins/lens/public/index.ts b/x-pack/plugins/lens/public/index.ts
index b8d00e7ff61b8..edf57ba703a2e 100644
--- a/x-pack/plugins/lens/public/index.ts
+++ b/x-pack/plugins/lens/public/index.ts
@@ -87,7 +87,6 @@ export type {
   IconPosition,
   ExtendedYConfigResult,
   DataLayerArgs,
-  LensMultiTable,
   ValueLabelMode,
   AxisExtentMode,
   DataLayerConfig,
diff --git a/x-pack/plugins/lens/public/xy_visualization/__snapshots__/to_expression.test.ts.snap b/x-pack/plugins/lens/public/xy_visualization/__snapshots__/to_expression.test.ts.snap
index 9c4ee0d3b245f..afdfd8e200100 100644
--- a/x-pack/plugins/lens/public/xy_visualization/__snapshots__/to_expression.test.ts.snap
+++ b/x-pack/plugins/lens/public/xy_visualization/__snapshots__/to_expression.test.ts.snap
@@ -134,13 +134,7 @@ Object {
                   ],
                   "table": Array [
                     Object {
-                      "chain": Array [
-                        Object {
-                          "arguments": Object {},
-                          "function": "kibana",
-                          "type": "function",
-                        },
-                      ],
+                      "chain": Array [],
                       "type": "expression",
                     },
                   ],
diff --git a/x-pack/plugins/lens/public/xy_visualization/to_expression.ts b/x-pack/plugins/lens/public/xy_visualization/to_expression.ts
index 5ac8b9693e281..163131272d084 100644
--- a/x-pack/plugins/lens/public/xy_visualization/to_expression.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/to_expression.ts
@@ -11,7 +11,6 @@ import type { PaletteRegistry } from '@kbn/coloring';
 
 import { EventAnnotationServiceType } from '@kbn/event-annotation-plugin/public';
 import type { AxisExtentConfig, ExtendedYConfig, YConfig } from '@kbn/expression-xy-plugin/common';
-import type { ExpressionAstExpression } from '@kbn/expressions-plugin/common';
 import {
   State,
   XYDataLayerConfig,
diff --git a/x-pack/plugins/maps/public/lens/choropleth_chart/choropleth_chart.tsx b/x-pack/plugins/maps/public/lens/choropleth_chart/choropleth_chart.tsx
index 5089a8cc6c8d5..467c2ce92ff6e 100644
--- a/x-pack/plugins/maps/public/lens/choropleth_chart/choropleth_chart.tsx
+++ b/x-pack/plugins/maps/public/lens/choropleth_chart/choropleth_chart.tsx
@@ -45,12 +45,10 @@ export function ChoroplethChart({
     return null;
   }
 
-  const table = data.tables[args.layerId];
-
   let emsLayerId = args.emsLayerId ? args.emsLayerId : emsWorldLayerId;
   let emsField = args.emsField ? args.emsField : 'iso2';
   if (!args.emsLayerId || !args.emsField) {
-    const emsSuggestion = getEmsSuggestion(emsFileLayers, table, args.regionAccessor);
+    const emsSuggestion = getEmsSuggestion(emsFileLayers, data, args.regionAccessor);
     if (emsSuggestion) {
       emsLayerId = emsSuggestion.layerId;
       emsField = emsSuggestion.field;
@@ -66,7 +64,7 @@ export function ChoroplethChart({
           defaultMessage: '{emsLayerLabel} by {accessorLabel}',
           values: {
             emsLayerLabel,
-            accessorLabel: getAccessorLabel(table, args.valueAccessor),
+            accessorLabel: getAccessorLabel(data, args.valueAccessor),
           },
         })
       : '',
@@ -76,16 +74,16 @@ export function ChoroplethChart({
         right: {
           id: args.valueAccessor,
           type: SOURCE_TYPES.TABLE_SOURCE,
-          __rows: table.rows,
+          __rows: data.rows,
           __columns: [
             {
               name: args.regionAccessor,
-              label: getAccessorLabel(table, args.regionAccessor),
+              label: getAccessorLabel(data, args.regionAccessor),
               type: 'string',
             },
             {
               name: args.valueAccessor,
-              label: getAccessorLabel(table, args.valueAccessor),
+              label: getAccessorLabel(data, args.valueAccessor),
               type: 'number',
             },
           ],
diff --git a/x-pack/plugins/maps/public/lens/choropleth_chart/expression_function.ts b/x-pack/plugins/maps/public/lens/choropleth_chart/expression_function.ts
index 7ed1ddfbd4381..a138b51f8bfe7 100644
--- a/x-pack/plugins/maps/public/lens/choropleth_chart/expression_function.ts
+++ b/x-pack/plugins/maps/public/lens/choropleth_chart/expression_function.ts
@@ -6,8 +6,8 @@
  */
 
 import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { i18n } from '@kbn/i18n';
-import type { LensMultiTable } from '@kbn/lens-plugin/common';
 import { prepareLogTable } from '@kbn/visualizations-plugin/common/utils';
 import type { ChoroplethChartConfig, ChoroplethChartProps } from './types';
 import { RENDERER_ID } from './expression_renderer';
@@ -20,7 +20,7 @@ interface ChoroplethChartRender {
 
 export const getExpressionFunction = (): ExpressionFunctionDefinition<
   'lens_choropleth_chart',
-  LensMultiTable,
+  Datatable,
   Omit<ChoroplethChartConfig, 'layerType'>,
   ChoroplethChartRender
 > => ({
@@ -57,11 +57,11 @@ export const getExpressionFunction = (): ExpressionFunctionDefinition<
       help: 'Value accessor identifies the value column',
     },
   },
-  inputTypes: ['lens_multitable'],
+  inputTypes: ['datatable'],
   fn(data, args, handlers) {
     if (handlers?.inspectorAdapters?.tables) {
       const logTable = prepareLogTable(
-        Object.values(data.tables)[0],
+        data,
         [
           [
             args.valueAccessor ? [args.valueAccessor] : undefined,
@@ -88,6 +88,6 @@ export const getExpressionFunction = (): ExpressionFunctionDefinition<
         data,
         args,
       },
-    } as ChoroplethChartRender;
+    };
   },
 });
diff --git a/x-pack/plugins/maps/public/lens/choropleth_chart/types.ts b/x-pack/plugins/maps/public/lens/choropleth_chart/types.ts
index 79c05a93ef2d4..7dc9a16056e77 100644
--- a/x-pack/plugins/maps/public/lens/choropleth_chart/types.ts
+++ b/x-pack/plugins/maps/public/lens/choropleth_chart/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { LensMultiTable } from '@kbn/lens-plugin/common';
+import { Datatable } from '@kbn/expressions-plugin/common';
 
 export interface ChoroplethChartState {
   layerId: string;
@@ -21,6 +21,6 @@ export interface ChoroplethChartConfig extends ChoroplethChartState {
 }
 
 export interface ChoroplethChartProps {
-  data: LensMultiTable;
+  data: Datatable;
   args: ChoroplethChartConfig;
 }