diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b43b476d8..679cc4ce9c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@
       <!-- TODO: fill link to storybook -->
       - Check the [Context Menu]() example
     - ⚠️ `enableCellSelect`
+    - ⚠️ `enableCellAutoFocus`
     - ⚠️ `getValidFilterValues`
     - ⚠️ `onCellCopyPaste`
     - ⚠️ `onSelectedCellRangeChange`
diff --git a/src/DataGrid.tsx b/src/DataGrid.tsx
index 04adab806e..5b25afccf3 100644
--- a/src/DataGrid.tsx
+++ b/src/DataGrid.tsx
@@ -129,8 +129,6 @@ export interface DataGridProps<R, K extends keyof R, SR = unknown> {
    */
   /** Toggles whether filters row is displayed or not */
   enableFilters?: boolean;
-  /** Toggles whether cells should be autofocused */
-  enableCellAutoFocus?: boolean;
   enableCellCopyPaste?: boolean;
   enableCellDragAndDrop?: boolean;
   cellNavigationMode?: CellNavigationMode;
@@ -184,7 +182,6 @@ function DataGrid<R, K extends keyof R, SR>({
   onCheckCellIsEditable,
   // Toggles and modes
   enableFilters = false,
-  enableCellAutoFocus = true,
   enableCellCopyPaste = false,
   enableCellDragAndDrop = false,
   cellNavigationMode = CellNavigationMode.NONE,
@@ -446,7 +443,6 @@ function DataGrid<R, K extends keyof R, SR>({
               rows={rows}
               rowHeight={rowHeight}
               columns={columns}
-              enableCellAutoFocus={enableCellAutoFocus}
               enableCellCopyPaste={enableCellCopyPaste}
               enableCellDragAndDrop={enableCellDragAndDrop}
               cellNavigationMode={cellNavigationMode}
diff --git a/src/masks/InteractionMasks.test.tsx b/src/masks/InteractionMasks.test.tsx
index 09f7bf81fd..b49f75f1fd 100644
--- a/src/masks/InteractionMasks.test.tsx
+++ b/src/masks/InteractionMasks.test.tsx
@@ -36,7 +36,6 @@ describe('InteractionMasks', () => {
       scrollToCell: jest.fn(),
       onSelectedCellChange,
       onRowsUpdate: jest.fn(),
-      enableCellAutoFocus: false,
       enableCellCopyPaste: true,
       enableCellDragAndDrop: true,
       cellNavigationMode: CellNavigationMode.NONE,
diff --git a/src/masks/InteractionMasks.tsx b/src/masks/InteractionMasks.tsx
index 24d85cc3f1..84d0d6c68f 100644
--- a/src/masks/InteractionMasks.tsx
+++ b/src/masks/InteractionMasks.tsx
@@ -28,7 +28,6 @@ type SharedCanvasProps<R, SR> = Pick<DataGridProps<R, never, SR>,
   | 'onSelectedCellChange'
 > & Pick<Required<DataGridProps<R, never, SR>>,
   | 'rowHeight'
-  | 'enableCellAutoFocus'
   | 'enableCellCopyPaste'
   | 'enableCellDragAndDrop'
   | 'cellNavigationMode'
@@ -60,7 +59,6 @@ export default function InteractionMasks<R, SR>({
   rows,
   rowHeight,
   eventBus,
-  enableCellAutoFocus,
   enableCellCopyPaste,
   enableCellDragAndDrop,
   editorPortalTarget,
@@ -74,12 +72,7 @@ export default function InteractionMasks<R, SR>({
   onRowsUpdate,
   scrollToCell
 }: InteractionMasksProps<R, SR>) {
-  const [selectedPosition, setSelectedPosition] = useState<SelectCellState | EditCellState>(() => {
-    if (enableCellAutoFocus && document.activeElement === document.body && columns.length > 0 && rows.length > 0) {
-      return { idx: 0, rowIdx: 0, status: 'SELECT' };
-    }
-    return { idx: -1, rowIdx: -1, status: 'SELECT' };
-  });
+  const [selectedPosition, setSelectedPosition] = useState<SelectCellState | EditCellState>({ idx: -1, rowIdx: -1, status: 'SELECT' });
   const [copiedPosition, setCopiedPosition] = useState<Position & { value: unknown } | null>(null);
   const [draggedPosition, setDraggedPosition] = useState<DraggedPosition | null>(null);
   const selectionMaskRef = useRef<HTMLDivElement>(null);
diff --git a/stories/demos/example21-cell-selection-events.js b/stories/demos/example21-cell-selection-events.js
index 7e83623e49..87709fcf8b 100644
--- a/stories/demos/example21-cell-selection-events.js
+++ b/stories/demos/example21-cell-selection-events.js
@@ -54,7 +54,6 @@ export default class extends React.Component {
           rowsCount={this._rows.length}
           minHeight={500}
           enableCellSelect
-          enableCellAutoFocus={false}
           onSelectedCellChange={this.onSelectedCellChange}
         />
       </Wrapper>