diff --git a/web/react/components/post_body_additional_content.jsx b/web/react/components/post_body_additional_content.jsx
index c2a928f3b0..70b3c8dbf8 100644
--- a/web/react/components/post_body_additional_content.jsx
+++ b/web/react/components/post_body_additional_content.jsx
@@ -112,24 +112,32 @@ export default class PostBodyAdditionalContent extends React.Component {
     }
 
     render() {
-        var generateEmbed = this.generateEmbed();
+        const generateEmbed = this.generateEmbed();
+
         if (generateEmbed) {
-            return (
-                <div>
+            let toggle;
+            if (Utils.isFeatureEnabled(Constants.PRE_RELEASE_FEATURES.EMBED_TOGGLE)) {
+                toggle = (
                     <a className='post__embed-visibility'
                         data-expanded={this.state.embedVisible}
                         aria-label='Toggle Embed Visibility'
                         onClick={this.toggleEmbedVisibility}
-                    >
-                    </a>
+                    />
+                );
+            }
+
+            return (
+                <div>
+                    {toggle}
                     <div className='post__embed-container'
                         hidden={!this.state.embedVisible}
                     >
                     {generateEmbed}
                     </div>
                 </div>
-                );
+            );
         }
+
         return null;
     }
 }