diff --git a/src/components/List/List.tsx b/src/components/List/List.tsx
index 1fb3e9937..707e1a9bf 100644
--- a/src/components/List/List.tsx
+++ b/src/components/List/List.tsx
@@ -1,4 +1,4 @@
-import React, { RefObject, useImperativeHandle, useRef, forwardRef, useMemo } from 'react';
+import React, { RefObject, useImperativeHandle, useRef, forwardRef } from 'react';
import classnames from 'classnames';
import { DEFAULTS, STYLE } from './List.constants';
diff --git a/src/components/ListItemBase/ListItemBase.test.tsx b/src/components/ListItemBase/ListItemBase.test.tsx
index 2f746300d..db1a0e7ac 100644
--- a/src/components/ListItemBase/ListItemBase.test.tsx
+++ b/src/components/ListItemBase/ListItemBase.test.tsx
@@ -544,6 +544,40 @@ describe('ListItemBase', () => {
expect(getByTestId('list-item-1')).toHaveFocus();
});
+ it('if an item index changes for a particular item, the old item should not be remembered', async () => {
+ const { getByTestId, rerender } = render(
+
+
+ 1
+
+
+ 2
+
+
+ );
+
+ simulateOnPress(getByTestId, 'list-item-2');
+
+ expect(getByTestId('list-item-2')).toHaveFocus();
+
+ rerender(
+
+
+ 1
+
+
+ 2
+
+
+ );
+
+ // press up arrow key
+ fireEvent.keyDown(getByTestId('list-item-2'), { key: 'ArrowUp' });
+
+ // If the old item index was remembered, the focus would be on list-item-1
+ expect(getByTestId('list-item-2')).toHaveFocus();
+ });
+
it('should not focus on press with focusChild even if shouldFocusOnPress is set', async () => {
const { getByTestId } = render(