diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
index 68f074335a..05b9db0c92 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -517,6 +517,8 @@ class ChatActivity :
             binding.messageInputView.messageInput.setText(text)
         }
         this.lifecycle.addObserver(AudioUtils)
+        isVoiceRecordingLocked = false
+        endVoiceRecordingUI()
     }
 
     override fun onStop() {
@@ -525,6 +527,7 @@ class ChatActivity :
         stopPreviewVoicePlaying()
         if (isMicInputAudioThreadRunning) {
             stopMicInputRecordingAnimation()
+            stopAndDiscardAudioRecording()
         }
         if (mediaRecorderState == MediaRecorderState.RECORDING) {
             stopAudioRecording()