diff --git a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java
index b582d7afe1..91450e102b 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java
@@ -42,7 +42,9 @@ public class EmojiParser {
   public @NonNull CandidateList findCandidates(@Nullable CharSequence text) {
     List<Candidate> results = new LinkedList<>();
 
-    if (text == null) return new CandidateList(results, false);
+    if (text == null) {
+      return new CandidateList(results, false);
+    }
 
     boolean allEmojis = text.length() > 0;
 
@@ -61,11 +63,13 @@ public class EmojiParser {
         results.add(new Candidate(i, emojiEnd, drawInfo));
 
         i = emojiEnd - 1;
-      } else {
+      } else if (text.charAt(i) != ' '){
         allEmojis = false;
       }
     }
 
+    allEmojis &= !results.isEmpty();
+
     return new CandidateList(results, allEmojis);
   }