diff --git a/playwright/e2e/timeline/media-preview-settings.spec.ts b/playwright/e2e/timeline/media-preview-settings.spec.ts
index 23777eea65..d262704428 100644
--- a/playwright/e2e/timeline/media-preview-settings.spec.ts
+++ b/playwright/e2e/timeline/media-preview-settings.spec.ts
@@ -10,9 +10,7 @@ import * as fs from "node:fs";
 import { type EventType, type MsgType } from "matrix-js-sdk/src/types";
 import { JoinRule } from "matrix-js-sdk/src/matrix";
 
-import type { Locator, Page } from "@playwright/test";
 import { test, expect } from "../../element-web-test";
-import { Bot } from "../../pages/bot";
 
 const ROOM_NAME = "Test room";
 const OLD_NAME = "Alan";
@@ -44,10 +42,10 @@ test.describe("Media preview settings", () => {
         await settings.getByLabel("Hide avatars of room and inviter").click();
         await app.closeDialog();
         await app.viewRoomById(room.roomId);
-        expect(page.getByRole("complementary").filter({ hasText: "Do you want to join Test room" })).toMatchScreenshot(
-            "invite-no-avatar.png",
-        );
-        expect(
+        await expect(
+            page.getByRole("complementary").filter({ hasText: "Do you want to join Test room" }),
+        ).toMatchScreenshot("invite-no-avatar.png");
+        await expect(
             page.getByRole("tree", { name: "Rooms" }).getByRole("treeitem", { name: "Test room" }),
         ).toMatchScreenshot("invite-room-tree-no-avatar.png");
 
@@ -57,10 +55,10 @@ test.describe("Media preview settings", () => {
         await app.closeDialog();
         await page.goto("#/home");
         await app.viewRoomById(room.roomId);
-        expect(page.getByRole("complementary").filter({ hasText: "Do you want to join Test room" })).toMatchScreenshot(
-            "invite-with-avatar.png",
-        );
-        expect(
+        await expect(
+            page.getByRole("complementary").filter({ hasText: "Do you want to join Test room" }),
+        ).toMatchScreenshot("invite-with-avatar.png");
+        await expect(
             page.getByRole("tree", { name: "Rooms" }).getByRole("treeitem", { name: "Test room" }),
         ).toMatchScreenshot("invite-room-tree-with-avatar.png");
     });
diff --git a/playwright/snapshots/timeline/media-preview-settings.spec.ts/invite-no-avatar-linux.png b/playwright/snapshots/timeline/media-preview-settings.spec.ts/invite-no-avatar-linux.png
index 00fdb29c81..f706297f52 100644
Binary files a/playwright/snapshots/timeline/media-preview-settings.spec.ts/invite-no-avatar-linux.png and b/playwright/snapshots/timeline/media-preview-settings.spec.ts/invite-no-avatar-linux.png differ
diff --git a/playwright/snapshots/timeline/media-preview-settings.spec.ts/invite-room-tree-no-avatar-linux.png b/playwright/snapshots/timeline/media-preview-settings.spec.ts/invite-room-tree-no-avatar-linux.png
index 452f08d3e2..29d129f73f 100644
Binary files a/playwright/snapshots/timeline/media-preview-settings.spec.ts/invite-room-tree-no-avatar-linux.png and b/playwright/snapshots/timeline/media-preview-settings.spec.ts/invite-room-tree-no-avatar-linux.png differ
diff --git a/src/components/views/avatars/RoomAvatar.tsx b/src/components/views/avatars/RoomAvatar.tsx
index f74c061c68..1572cdb716 100644
--- a/src/components/views/avatars/RoomAvatar.tsx
+++ b/src/components/views/avatars/RoomAvatar.tsx
@@ -101,7 +101,7 @@ export const RoomAvatar: React.FC<IProps> = ({
             oobAvatar, // highest priority
             roomAvatarMxc && Avatar.avatarUrlForRoom(room ?? null, sizeInt, sizeInt, "crop"),
         ]);
-    }, [mediaPreviewEnabled, room, size, roomAvatarMxc]);
+    }, [mediaPreviewEnabled, room, size, roomAvatarMxc, oobData]);
 
     return (
         <BaseAvatar