diff --git a/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift b/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift
index ef7bf6131..e6a84e54c 100644
--- a/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift
+++ b/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift
@@ -304,6 +304,7 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
             selectivelyUpdateTimelineItems(timelineItemsDictionary: timelineItemsDictionary)
         } else {
             state.timelineViewState.itemsDictionary = timelineItemsDictionary
+            state.timelineViewState.renderedTimelineIDs = Array(timelineItemsDictionary.keys)
         }
     }
 
diff --git a/UnitTests/Sources/RoomNotificationSettingsScreenViewModelTests.swift b/UnitTests/Sources/RoomNotificationSettingsScreenViewModelTests.swift
index cc4c2969c..7ab923863 100644
--- a/UnitTests/Sources/RoomNotificationSettingsScreenViewModelTests.swift
+++ b/UnitTests/Sources/RoomNotificationSettingsScreenViewModelTests.swift
@@ -122,7 +122,7 @@ class RoomNotificationSettingsScreenViewModelTests: XCTestCase {
         try await deferredState.fulfill()
 
         do {
-            var deferredViewState = deferFulfillment(context.$viewState.collect(2).first())
+            let deferredViewState = deferFulfillment(context.$viewState.collect(2).first())
             context.send(viewAction: .setCustomMode(.allMessages))
             try await deferredViewState.fulfill()
             
@@ -132,7 +132,7 @@ class RoomNotificationSettingsScreenViewModelTests: XCTestCase {
         }
         
         do {
-            var deferredViewState = deferFulfillment(context.$viewState.collect(2).first())
+            let deferredViewState = deferFulfillment(context.$viewState.collect(2).first())
             context.send(viewAction: .setCustomMode(.mute))
             try await deferredViewState.fulfill()
             
@@ -142,7 +142,7 @@ class RoomNotificationSettingsScreenViewModelTests: XCTestCase {
         }
         
         do {
-            var deferredViewState = deferFulfillment(context.$viewState.collect(2).first())
+            let deferredViewState = deferFulfillment(context.$viewState.collect(2).first())
             context.send(viewAction: .setCustomMode(.mentionsAndKeywordsOnly))
             try await deferredViewState.fulfill()