diff --git a/webapp/titanembeds/static/js/embed.js b/webapp/titanembeds/static/js/embed.js
index f16e5ca..edcb8e4 100644
--- a/webapp/titanembeds/static/js/embed.js
+++ b/webapp/titanembeds/static/js/embed.js
@@ -43,6 +43,7 @@
     var global_guest_icon = null; // Guest icon
     var notification_sound = null; // Sound Manager 2 demonstrative.mp3 object https://notificationsounds.com/message-tones/demonstrative-516
     var notification_sound_setting; // nothing, mentions, newmsgs - to control what new sound it makes
+    var display_richembeds; // true/false - if rich embeds should be displayed
 
     function element_in_view(element, fullyInView) {
         var pageTop = $(window).scrollTop();
@@ -269,6 +270,19 @@
             volume: 8,
         });
         
+        $("[name=richembed_toggle_radiobtn]").click(function (event) {
+            display_richembeds = event.target.value == "true";
+            localStorage.setItem("display_richembeds", display_richembeds);
+            $("[name=richembed_toggle_radiobtn][value=" + display_richembeds + "]").prop("checked", true);
+        });
+        var localstore_display_richembeds = localStorage.getItem("display_richembeds");
+        if (localstore_display_richembeds) {
+            display_richembeds = !(localstore_display_richembeds == "false");
+        } else {
+            display_richembeds = true;
+        }
+        $("[name=richembed_toggle_radiobtn][value=" + display_richembeds + "]").prop("checked", true);
+        
         var dembed = discord_embed();
         dembed.done(function (data) {
             $("#modal_invite_btn").attr("href", data.instant_invite);
@@ -998,28 +1012,30 @@
     
     function parse_message_embeds(embeds) {
         var emb = [];
-        for (var i = 0; i < embeds.length; i++) {
-            var disembed = embeds[i];
-            // if ($.inArray(disembed.type, ["rich", "link", "video"]) == -1) {
-            //     continue;
-            // }
-            disembed.toRenderFooter = false;
-            if (disembed.footer) {
-                disembed.toRenderFooter = true;
-            } else if (disembed.timestamp) {
-                disembed.toRenderFooter = true;
+        if (display_richembeds) {
+            for (var i = 0; i < embeds.length; i++) {
+                var disembed = embeds[i];
+                // if ($.inArray(disembed.type, ["rich", "link", "video"]) == -1) {
+                //     continue;
+                // }
+                disembed.toRenderFooter = false;
+                if (disembed.footer) {
+                    disembed.toRenderFooter = true;
+                } else if (disembed.timestamp) {
+                    disembed.toRenderFooter = true;
+                }
+                disembed.footerVerticalBar = disembed.footer && disembed.timestamp;
+                if (disembed.timestamp) {
+                    disembed.formatted_timestamp = moment(disembed.timestamp).format('ddd MMM Do, YYYY [at] h:mm A');
+                }
+                if (disembed.color) {
+                    disembed.hexColor = "#" + disembed.color.toString(16);
+                }
+                var template = $('#mustache_richembed').html();
+                Mustache.parse(template);
+                var rendered = Mustache.render(template, disembed);
+                emb.push(rendered);
             }
-            disembed.footerVerticalBar = disembed.footer && disembed.timestamp;
-            if (disembed.timestamp) {
-                disembed.formatted_timestamp = moment(disembed.timestamp).format('ddd MMM Do, YYYY [at] h:mm A');
-            }
-            if (disembed.color) {
-                disembed.hexColor = "#" + disembed.color.toString(16);
-            }
-            var template = $('#mustache_richembed').html();
-            Mustache.parse(template);
-            var rendered = Mustache.render(template, disembed);
-            emb.push(rendered);
         }
         return emb;
     }
diff --git a/webapp/titanembeds/templates/embed.html.j2 b/webapp/titanembeds/templates/embed.html.j2
index 45b83f2..8401827 100644
--- a/webapp/titanembeds/templates/embed.html.j2
+++ b/webapp/titanembeds/templates/embed.html.j2
@@ -171,6 +171,19 @@
             </span>
           </div>
         </div>
+        <h4>{{ _("Display Rich Embeds") }}</h4>
+        <div class="row">
+          <div class="col s12">
+            <span>
+              <input name="richembed_toggle_radiobtn" type="radio" id="richembed_toggle_radiobtn_enable" value="true" />
+              <label for="richembed_toggle_radiobtn_enable">{{ _("Enable") }}</label>
+            </span>
+            <span>
+              <input name="richembed_toggle_radiobtn" type="radio" id="richembed_toggle_radiobtn_disable" value="false" />
+              <label for="richembed_toggle_radiobtn_disable">{{ _("Disable") }}</label>
+            </span>
+          </div>
+        </div>
         <div class="row">
           <a id="logout_btn" class="waves-effect waves-light btn right" href="{{ url_for('user.logout', redirect=request.url) }}"><i class="material-icons">exit_to_app</i></a>
         </div>