diff --git a/app/components/autocomplete/emoji_suggestion/emoji_suggestion.js b/app/components/autocomplete/emoji_suggestion/emoji_suggestion.js
index 1b08ac26c..d118530ad 100644
--- a/app/components/autocomplete/emoji_suggestion/emoji_suggestion.js
+++ b/app/components/autocomplete/emoji_suggestion/emoji_suggestion.js
@@ -82,9 +82,9 @@ export default class EmojiSuggestion extends Component {
                 return;
             }
 
-            if (this.props.emojis !== nextProps.emojis) {
+            if (this.matchTerm.length) {
                 this.handleFuzzySearch(this.matchTerm, nextProps);
-            } else if (!this.matchTerm.length) {
+            } else {
                 const initialEmojis = [...nextProps.emojis];
                 initialEmojis.splice(0, 300);
                 const data = initialEmojis.sort();