diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
index 0cb36d569..f4e8e8945 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
@@ -1436,8 +1436,6 @@ class ChatController(args: Bundle) :
         if (mentionAutocomplete != null && mentionAutocomplete!!.isPopupShowing) {
             mentionAutocomplete?.dismissPopup()
         }
-
-        currentlyPlayedVoiceMessage?.let { stopMediaPlayer(it) }
     }
 
     override val title: String
@@ -1459,6 +1457,8 @@ class ChatController(args: Bundle) :
             actionBar?.setIcon(null)
         }
 
+        currentlyPlayedVoiceMessage?.let { stopMediaPlayer(it) }
+
         adapter = null
         inConversation = false
     }