diff --git a/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift b/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift
index 5380f21416..210990f484 100644
--- a/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift
+++ b/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift
@@ -464,6 +464,8 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
         case .recordVoiceMessage, .previewVoiceMessage:
             fatalError("invalid composer mode.")
         }
+        
+        state.timelineViewState.scrollToBottomPublisher.send(())
     }
         
     private func trackComposerMode(_ mode: RoomScreenComposerMode) {
diff --git a/changelog.d/2147.change b/changelog.d/2147.change
new file mode 100644
index 0000000000..d262753f5b
--- /dev/null
+++ b/changelog.d/2147.change
@@ -0,0 +1 @@
+Automatically scroll the timeline to the bottom when sending a message
\ No newline at end of file