diff --git a/app/javascript/gabsocial/components/popover/emoji_picker_popover.js b/app/javascript/gabsocial/components/popover/emoji_picker_popover.js
index c0e49b03..619dce9c 100644
--- a/app/javascript/gabsocial/components/popover/emoji_picker_popover.js
+++ b/app/javascript/gabsocial/components/popover/emoji_picker_popover.js
@@ -198,9 +198,9 @@ EmojiPickerMenu.propTypes = {
   onPick: PropTypes.func.isRequired,
   arrowOffsetLeft: PropTypes.string,
   arrowOffsetTop: PropTypes.string,
-  intl: PropTypes.object.isRequired,
   skinTone: PropTypes.number.isRequired,
   onSkinTone: PropTypes.func.isRequired,
+  intl: PropTypes.object.isRequired,
 }
 
 EmojiPickerMenu.defaultProps = {
@@ -208,8 +208,6 @@ EmojiPickerMenu.defaultProps = {
   frequentlyUsedEmojis: [],
 }
 
-injectIntl(EmojiPickerMenu)
-
 class EmojiPickerPopover extends ImmutablePureComponent {
 
   state = {
@@ -237,6 +235,7 @@ class EmojiPickerPopover extends ImmutablePureComponent {
 
   render () {
     const {
+      intl,
       onPickEmoji,
       onSkinTone,
       skinTone,
@@ -254,6 +253,7 @@ class EmojiPickerPopover extends ImmutablePureComponent {
         onClose={this.onHideDropdown}
       >
         <EmojiPickerMenu
+          intl={intl}
           customEmojis={customEmojis}
           loading={loading}
           onClose={this.onHideDropdown}
@@ -298,6 +298,7 @@ EmojiPickerPopover.propTypes = {
   skinTone: PropTypes.number.isRequired,
   onClosePopover: PropTypes.func.isRequired,
   isXS: PropTypes.bool,
+  intl: PropTypes.object.isRequired,
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(EmojiPickerPopover)
\ No newline at end of file
+export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(EmojiPickerPopover))
\ No newline at end of file