diff --git a/src/components/middle/composer/EmojiCategory.tsx b/src/components/middle/composer/EmojiCategory.tsx
index 2468d580e..ad91b46f7 100644
--- a/src/components/middle/composer/EmojiCategory.tsx
+++ b/src/components/middle/composer/EmojiCategory.tsx
@@ -58,6 +58,10 @@ const EmojiCategory: FC<OwnProps> = ({
       >
         {shouldRender && category.emojis.map((name) => {
           const emoji = allEmojis[name];
+          // Recent emojis may contain emoticons that are no longer in the list
+          if (!emoji) {
+            return undefined;
+          }
           // Some emojis have multiple skins and are represented as an Object with emojis for all skins.
           // For now, we select only the first emoji with 'neutral' skin.
           const displayedEmoji = 'id' in emoji ? emoji : emoji[1];