From 615fa8c28397e5f868947df22eda0fdda20f0f4b Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Fri, 8 May 2020 15:31:11 -0300
Subject: [PATCH] [FIX] Emoji picker search broken (#17570)

---
 app/emoji/client/emojiPicker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/emoji/client/emojiPicker.js b/app/emoji/client/emojiPicker.js
index 7894ab736ef..410bbfa5682 100644
--- a/app/emoji/client/emojiPicker.js
+++ b/app/emoji/client/emojiPicker.js
@@ -58,7 +58,7 @@ function getEmojisBySearchTerm(searchTerm) {
 
 		if (searchRegExp.test(current)) {
 			const emojiObject = emoji.list[current];
-			const { emojiPackage, shortnames } = emojiObject;
+			const { emojiPackage, shortnames = [] } = emojiObject;
 			let tone = '';
 			current = current.replace(/:/g, '');
 			const alias = shortnames[0] !== undefined ? shortnames[0].replace(/:/g, '') : shortnames[0];