diff --git a/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift b/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift
index d8f7e5998..d11c2a30b 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift
@@ -52,6 +52,7 @@ struct RoomScreen: View {
                         Text(message.text)
                     }
                     .listRowSeparator(.hidden)
+                    .id(message.id)
                 }
                 
                 Divider()
@@ -64,6 +65,7 @@ struct RoomScreen: View {
             }
             .onChange(of: context.viewState.messages) { _ in
                 if backPaginationMessageIdentifier != nil {
+                    reader.scrollTo(backPaginationMessageIdentifier, anchor: .bottom)
                     self.backPaginationMessageIdentifier = nil
                     return
                 }