diff --git a/webapp/src/components/utils/emoji.tsx b/webapp/src/components/utils/emoji.tsx
index f36eb0c..088983a 100644
--- a/webapp/src/components/utils/emoji.tsx
+++ b/webapp/src/components/utils/emoji.tsx
@@ -1,6 +1,6 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
-import React from 'react';
+import React, {memo} from 'react';
 import {useSelector} from 'react-redux';
 
 import {GlobalState} from 'mattermost-redux/types/store';
@@ -16,7 +16,7 @@ interface ComponentProps {
 
 const FALLBACK_EMOJI = 'question';
 
-const RenderEmoji = ({emojiName, emojiStyle, size}: ComponentProps) => {
+const RenderEmoji = ({emojiName, emojiStyle, size = 16}: ComponentProps) => {
     const emojiMap = useSelector((state: GlobalState) => getEmojiMap(state));
 
     if (!emojiName) {
@@ -51,10 +51,4 @@ const RenderEmoji = ({emojiName, emojiStyle, size}: ComponentProps) => {
     );
 };
 
-RenderEmoji.defaultProps = {
-    emoji: '',
-    emojiStyle: {},
-    size: 16,
-};
-
-export default React.memo(RenderEmoji);
+export default memo(RenderEmoji);