diff --git a/webapp/components/create_comment.jsx b/webapp/components/create_comment.jsx
index 1ea87663b8..d9274c34ac 100644
--- a/webapp/components/create_comment.jsx
+++ b/webapp/components/create_comment.jsx
@@ -571,7 +571,7 @@ export default class CreateComment extends React.Component {
         );
 
         let emojiPicker = null;
-        if (Utils.isFeatureEnabled(Constants.PRE_RELEASE_FEATURES.EMOJI_PICKER_PREVIEW)) {
+        if (window.mm_config.EnableEmojiPicker === 'true') {
             emojiPicker = (
                 <span>
                     <EmojiPickerOverlay
diff --git a/webapp/components/create_post.jsx b/webapp/components/create_post.jsx
index c070305432..f2f4d7e395 100644
--- a/webapp/components/create_post.jsx
+++ b/webapp/components/create_post.jsx
@@ -721,7 +721,7 @@ export default class CreatePost extends React.Component {
         );
 
         let emojiPicker = null;
-        if (Utils.isFeatureEnabled(Constants.PRE_RELEASE_FEATURES.EMOJI_PICKER_PREVIEW)) {
+        if (window.mm_config.EnableEmojiPicker === 'true') {
             emojiPicker = (
                 <span>
                     <EmojiPickerOverlay