diff --git a/src/components/datagrid/data_grid.test.tsx b/src/components/datagrid/data_grid.test.tsx
index 302e0e84c462..367a157a13a3 100644
--- a/src/components/datagrid/data_grid.test.tsx
+++ b/src/components/datagrid/data_grid.test.tsx
@@ -8,8 +8,8 @@
 
 import React, { useEffect, useState } from 'react';
 import { mount, ReactWrapper } from 'enzyme';
-import { EuiDataGrid, RenderCellValue, RenderCellValueWithContext } from './';
-import { EuiDataGridProps } from './data_grid_types';
+import { EuiDataGrid } from './';
+import type { EuiDataGridProps, RenderCellValue } from './data_grid_types';
 import { findTestSubject, requiredProps } from '../../test';
 import { render } from '../../test/rtl';
 import { EuiDataGridColumnResizer } from './body/header/data_grid_column_resizer';
@@ -988,9 +988,7 @@ describe('EuiDataGrid', () => {
         rowCount: 1,
       };
 
-      const RenderCellValueWithContext: RenderCellValueWithContext = ({
-        someContext,
-      }) => (
+      const RenderCellValueWithContext: RenderCellValue = ({ someContext }) => (
         <div data-test-subj="renderedCell">
           {someContext ? 'hello' : 'world'}
         </div>
diff --git a/src/components/datagrid/data_grid_types.ts b/src/components/datagrid/data_grid_types.ts
index 4ce7375c79f7..8608552e6c0f 100644
--- a/src/components/datagrid/data_grid_types.ts
+++ b/src/components/datagrid/data_grid_types.ts
@@ -604,18 +604,15 @@ export interface EuiDataGridCellPopoverElementProps
   ) => void;
 }
 
-type CellContext = Record<string, any>;
-
-export type EuiDataGridCellValueElementPropsWithContext =
-  EuiDataGridCellValueElementProps & CellContext;
+type CellContext = Omit<
+  Record<string, any>,
+  keyof EuiDataGridCellValueElementProps
+>;
+type CellPropsWithContext = CellContext & EuiDataGridCellValueElementProps;
 
 export type RenderCellValue =
-  | ((props: EuiDataGridCellValueElementProps) => ReactNode)
-  | ComponentClass<EuiDataGridCellValueElementProps>;
-
-export type RenderCellValueWithContext =
-  | ((props: EuiDataGridCellValueElementPropsWithContext) => ReactNode)
-  | ComponentClass<EuiDataGridCellValueElementPropsWithContext>;
+  | ((props: CellPropsWithContext) => ReactNode)
+  | ComponentClass<CellPropsWithContext>;
 
 export interface EuiDataGridCellProps {
   rowIndex: number;
@@ -629,7 +626,7 @@ export interface EuiDataGridCellProps {
   isExpandable: boolean;
   className?: string;
   popoverContext: DataGridCellPopoverContextShape;
-  renderCellValue: RenderCellValue | RenderCellValueWithContext;
+  renderCellValue: RenderCellValue;
   cellContext?: CellContext;
   renderCellPopover?:
     | JSXElementConstructor<EuiDataGridCellPopoverElementProps>