diff --git a/client/homebrew/editor/editor.jsx b/client/homebrew/editor/editor.jsx
index db842b952..f5c1766a8 100644
--- a/client/homebrew/editor/editor.jsx
+++ b/client/homebrew/editor/editor.jsx
@@ -228,6 +228,7 @@ const Editor = createClass({
 
 							while (startIndex >= 0) {
 								emojiRegex.lastIndex = startIndex;
+								let match = emojiRegex.exec(line);
 								if (match) {
 									let tokens = Markdown.marked.lexer(match[0]);
 									tokens = tokens[0].tokens.filter(t => t.type == 'emoji')