diff --git a/ElementX/Sources/Screens/RoomScreen/RoomScreenInteractionHandler.swift b/ElementX/Sources/Screens/RoomScreen/RoomScreenInteractionHandler.swift
index deaaca4b3d..2c11217c87 100644
--- a/ElementX/Sources/Screens/RoomScreen/RoomScreenInteractionHandler.swift
+++ b/ElementX/Sources/Screens/RoomScreen/RoomScreenInteractionHandler.swift
@@ -373,6 +373,7 @@ class RoomScreenInteractionHandler {
             actionsSubject.send(.composer(action: .setMode(mode: .recordVoiceMessage(state: audioRecordState))))
         case .didStopRecording(let previewAudioPlayerState, let url):
             actionsSubject.send(.composer(action: .setMode(mode: .previewVoiceMessage(state: previewAudioPlayerState, waveform: .url(url), isUploading: false))))
+            voiceMessageRecorderObserver = nil
         case .didFailWithError(let error):
             switch error {
             case .audioRecorderError(.recordPermissionNotGranted):
@@ -397,7 +398,6 @@ class RoomScreenInteractionHandler {
     
     func stopRecordingVoiceMessage() async {
         await voiceMessageRecorder.stopRecording()
-        voiceMessageRecorderObserver = nil
     }
     
     func cancelRecordingVoiceMessage() async {
diff --git a/changelog.d/2845.bugfix b/changelog.d/2845.bugfix
new file mode 100644
index 0000000000..e4812609a2
--- /dev/null
+++ b/changelog.d/2845.bugfix
@@ -0,0 +1 @@
+Fix voice message recoder not showing send message button
\ No newline at end of file