diff --git a/app/src/components/composer-editor/emoji-plugins.jsx b/app/src/components/composer-editor/emoji-plugins.jsx
index 2b4f818fd..3329d7f68 100644
--- a/app/src/components/composer-editor/emoji-plugins.jsx
+++ b/app/src/components/composer-editor/emoji-plugins.jsx
@@ -69,11 +69,12 @@ function FloatingEmojiPicker({ value, onChange }) {
   let emoji = null;
   try {
     emoji = value.marks.find(i => i.type === EMOJI_TYPING_TYPE);
-    if (!emoji) return false;
   } catch (err) {
     // sometimes fails for some reason
   }
 
+  if (!emoji) return false;
+
   const picked = emoji.data.get('picked');
   const suggestions = emoji.data.get('suggestions');
   if (!suggestions || !suggestions.length) return false;