diff --git a/src/components/utils/ListView.tsx b/src/components/utils/ListView.tsx
index 9df5b67e69..36b33186c9 100644
--- a/src/components/utils/ListView.tsx
+++ b/src/components/utils/ListView.tsx
@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import React, { useRef, type JSX, useCallback, useEffect, useState } from "react";
+import React, { useRef, type JSX, useCallback, useEffect, useState, useMemo } from "react";
 import { type VirtuosoHandle, type ListRange, Virtuoso, type VirtuosoProps } from "react-virtuoso";
 
 import { isModifiedKeyEvent, Key } from "../../Keyboard";
@@ -293,11 +293,14 @@ export function ListView<Item, Context = any>(props: IListViewProps<Item, Contex
         }
     }, []);
 
-    const listContext: ListContext<Context> = {
-        tabIndexKey: tabIndexKey,
-        focused: isFocused,
-        context: props.context || ({} as Context),
-    };
+    const listContext: ListContext<Context> = useMemo(
+        () => ({
+            tabIndexKey: tabIndexKey,
+            focused: isFocused,
+            context: props.context || ({} as Context),
+        }),
+        [tabIndexKey, isFocused, props.context],
+    );
 
     return (
         <Virtuoso
diff --git a/src/components/views/rooms/RoomListPanel/RoomList.tsx b/src/components/views/rooms/RoomListPanel/RoomList.tsx
index ee7b59c74e..36cbd39663 100644
--- a/src/components/views/rooms/RoomListPanel/RoomList.tsx
+++ b/src/components/views/rooms/RoomListPanel/RoomList.tsx
@@ -5,7 +5,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-import React, { useCallback, useRef, type JSX } from "react";
+import React, { useCallback, useRef, type JSX, useMemo } from "react";
 import { type Room } from "matrix-js-sdk/src/matrix";
 import { isEqual } from "lodash";
 
@@ -112,10 +112,14 @@ export function RoomList({ vm: { roomsResult, activeIndex } }: RoomListProps): J
             return;
         }
     }, []);
+    const context = useMemo<Context>(
+        () => ({ spaceId: roomsResult.spaceId, filterKeys: roomsResult.filterKeys }),
+        [roomsResult.spaceId, roomsResult.filterKeys],
+    );
 
     return (
         <ListView
-            context={{ spaceId: roomsResult.spaceId, filterKeys: roomsResult.filterKeys }}
+            context={context}
             scrollIntoViewOnChange={scrollIntoViewOnChange}
             initialTopMostItemIndex={activeIndex}
             data-testid="room-list"