1 files changed, 11 insertions, 6 deletions
diff --git a/webapp/components/user_settings/user_settings_advanced.jsx b/webapp/components/user_settings/user_settings_advanced.jsx
index 6e3d488e1..3459af8b3 100644
--- a/webapp/components/user_settings/user_settings_advanced.jsx
+++ b/webapp/components/user_settings/user_settings_advanced.jsx
@@ -53,14 +53,19 @@ export default class AdvancedSettingsDisplay extends React.Component {
             )
         };
 
-        let enabledFeatures = 0;
-        for (const [name, value] of advancedSettings) {
-            const webrtcEnabled = global.mm_config.EnableWebrtc === 'true';
+        const webrtcEnabled = global.mm_config.EnableWebrtc === 'true';
+        const linkPreviewsEnabled = global.mm_config.EnableLinkPreviews === 'true';
 
-            if (!webrtcEnabled) {
-                preReleaseFeaturesKeys = preReleaseFeaturesKeys.filter((f) => f !== 'WEBRTC_PREVIEW');
-            }
+        if (!webrtcEnabled) {
+            preReleaseFeaturesKeys = preReleaseFeaturesKeys.filter((f) => f !== 'WEBRTC_PREVIEW');
+        }
 
+        if (!linkPreviewsEnabled) {
+            preReleaseFeaturesKeys = preReleaseFeaturesKeys.filter((f) => f !== 'EMBED_PREVIEW');
+        }
+
+        let enabledFeatures = 0;
+        for (const [name, value] of advancedSettings) {
             for (const key of preReleaseFeaturesKeys) {
                 const feature = PreReleaseFeatures[key];