diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt
index 73e2d571c0..ffdc425c5b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt
@@ -13,6 +13,7 @@ import android.view.MotionEvent
 import android.view.inputmethod.EditorInfo
 import android.widget.RelativeLayout
 import android.widget.TextView
+import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import network.loki.messenger.R
 import network.loki.messenger.databinding.ViewInputBarBinding
@@ -118,8 +119,8 @@ class InputBar : RelativeLayout, InputBarEditTextDelegate, QuoteViewDelegate, Li
 
     // region Updating
     override fun inputBarEditTextContentChanged(text: CharSequence) {
-        sendButton.isVisible = text.isNotEmpty()
-        microphoneButton.isVisible = text.isEmpty()
+        microphoneButton.isVisible = text.all { it.isWhitespace() }
+        sendButton.isVisible = microphoneButton.isGone
         delegate?.inputBarEditTextContentChanged(text)
     }