2 files changed, 10 insertions, 7 deletions

diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx
index 3e335b901..296b9e7d7 100644
--- a/web/react/components/post_body.jsx
+++ b/web/react/components/post_body.jsx
@@ -6,6 +6,7 @@ import UserStore from '../stores/user_store.jsx';
 import * as Utils from '../utils/utils.jsx';
 import * as Emoji from '../utils/emoticons.jsx';
 import Constants from '../utils/constants.jsx';
+const PreReleaseFeatures = Constants.PRE_RELEASE_FEATURES;
 import * as TextFormatting from '../utils/text_formatting.jsx';
 import twemoji from 'twemoji';
 import PostBodyAdditionalContent from './post_body_additional_content.jsx';
@@ -109,12 +110,14 @@ export default class PostBody extends React.Component {
 
         const trimmedLink = link.trim();
 
-        const provider = this.getOembedProvider(trimmedLink);
-        if (provider != null) {
-            post.props.oEmbedLink = trimmedLink;
-            post.type = 'oEmbed';
-            this.setState({post, provider});
-            return '';
+        if (Utils.isFeatureEnabled(PreReleaseFeatures.EMBED_PREVIEW)) {
+            const provider = this.getOembedProvider(trimmedLink);
+            if (provider != null) {
+                post.props.oEmbedLink = trimmedLink;
+                post.type = 'oEmbed';
+                this.setState({post, provider});
+                return '';
+            }
         }
 
         const embed = this.createYoutubeEmbed(link);
diff --git a/web/react/components/user_settings/user_settings_advanced.jsx b/web/react/components/user_settings/user_settings_advanced.jsx
index b4d34c658..c15936ccd 100644
--- a/web/react/components/user_settings/user_settings_advanced.jsx
+++ b/web/react/components/user_settings/user_settings_advanced.jsx
@@ -195,7 +195,7 @@ export default class AdvancedSettingsDisplay extends React.Component {
                 inputs.push(
                     <div key='advancedPreviewFeatures_helptext'>
                         <br/>
-                        {'Check any pre-released features you\'d like to preview.'}
+                        {'Check any pre-released features you\'d like to preview.  You may also need to refresh the page before the setting will take effect.'}
                     </div>
                 );