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 450f6a0789..8acd7ef1ca 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -1004,7 +1004,11 @@ class ChatActivity :
     @SuppressLint("ClickableViewAccessibility")
     private fun initVoiceRecordButton() {
         if (!isVoiceRecordingLocked) {
-            showMicrophoneButton(true)
+            if (binding.messageInputView.messageInput.text!!.isNotEmpty()) {
+                showMicrophoneButton(false)
+            } else {
+                showMicrophoneButton(true)
+            }
         } else if (isVoiceRecordingInProgress) {
             binding.messageInputView.playPauseBtn.visibility = View.GONE
             binding.messageInputView.seekBar.visibility = View.GONE
@@ -3979,9 +3983,11 @@ class ChatActivity :
 
     private fun showMicrophoneButton(show: Boolean) {
         if (show && CapabilitiesUtilNew.hasSpreedFeatureCapability(conversationUser, "voice-message-sharing")) {
+            Log.d(TAG, "Microphone shown")
             binding.messageInputView.messageSendButton.visibility = View.GONE
             binding.messageInputView.recordAudioButton.visibility = View.VISIBLE
         } else {
+            Log.d(TAG, "Microphone hidden")
             binding.messageInputView.messageSendButton.visibility = View.VISIBLE
             binding.messageInputView.recordAudioButton.visibility = View.GONE
         }