diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
index 0a5be511b6..6a8a0de614 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
@@ -1375,6 +1375,10 @@ public class ConversationFragment extends Fragment
     }
 
     public void show() {
+      if (textView.getText() == null || textView.getText().length() == 0) {
+        return;
+      }
+
       if (pendingHide) {
         pendingHide = false;
       } else {