diff --git a/webapp/channels/src/components/emoji_picker/components/emoji_picker_header.tsx b/webapp/channels/src/components/emoji_picker/components/emoji_picker_header.tsx
index 0dde8427ab..c6b72536d6 100644
--- a/webapp/channels/src/components/emoji_picker/components/emoji_picker_header.tsx
+++ b/webapp/channels/src/components/emoji_picker/components/emoji_picker_header.tsx
@@ -9,30 +9,30 @@ type Props = {
     handleEmojiPickerClose: MouseEventHandler;
 }
 
-export default class EmojiPickerHeader extends React.PureComponent<Props> {
-    render(): React.ReactNode {
-        return (
-            <div className='emoji-picker__header modal-header'>
-                <button
-                    type='button'
-                    className='close emoji-picker__header-close-button'
-                    onClick={this.props.handleEmojiPickerClose}
-                >
-                    <span aria-hidden='true'>{'×'}</span>
-                    <span className='sr-only'>
-                        <FormattedMessage
-                            id={'emoji_picker.close'}
-                            defaultMessage={'Close'}
-                        />
-                    </span>
-                </button>
-                <h4 className='modal-title emoji-picker__header-title'>
+const EmojiPickerHeader = ({handleEmojiPickerClose}: Props) => {
+    return (
+        <div className='emoji-picker__header modal-header'>
+            <button
+                type='button'
+                className='close emoji-picker__header-close-button'
+                onClick={handleEmojiPickerClose}
+            >
+                <span aria-hidden='true'>{'×'}</span>
+                <span className='sr-only'>
                     <FormattedMessage
-                        id={'emoji_picker.header'}
-                        defaultMessage={'Emoji Picker'}
+                        id={'emoji_picker.close'}
+                        defaultMessage={'Close'}
                     />
-                </h4>
-            </div>
-        );
-    }
-}
+                </span>
+            </button>
+            <h4 className='modal-title emoji-picker__header-title'>
+                <FormattedMessage
+                    id={'emoji_picker.header'}
+                    defaultMessage={'Emoji Picker'}
+                />
+            </h4>
+        </div>
+    );
+};
+
+export default React.memo(EmojiPickerHeader);