diff --git a/Changes b/Changes
index 8d75c402e..ad2efea45 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,7 @@
 Revision history for perl distribution Convos
 
 0.99_18 Not Released
+ - Can disable expanding links
  - Server messages can be read in frontend
  - Server settings can be edited in the "info" sidebar
 
diff --git a/assets/js/main.js b/assets/js/main.js
index bc5c466a7..d7ffc3d40 100644
--- a/assets/js/main.js
+++ b/assets/js/main.js
@@ -32,6 +32,9 @@
       data: detail.data,
       mixins: detail.mixins,
       watch: {
+        "settings.expandUrls": function(v, o) {
+          localStorage.setItem("expandUrls", v ? "true" : "false");
+        },
         "settings.main": function(v, o) {
           if (DEBUG && v != o) console.log("[loc:main] " + (o || "null") + " => " + (v || "null"));
           localStorage.setItem("main", v);
diff --git a/assets/js/vue/mixin-global.js b/assets/js/vue/mixin-global.js
index 95ab30489..a7879f70f 100644
--- a/assets/js/vue/mixin-global.js
+++ b/assets/js/vue/mixin-global.js
@@ -1,6 +1,7 @@
 (function() {
   // localStorage items are maintained in root Vue object, in main.js
   // TODO: Should come up with better variable names than "main" and "sidebar"
+  Convos.settings.expandUrls = localStorage.getItem("expandUrls") == "false" ? false : true;
   Convos.settings.main = localStorage.getItem("main") || "";
   Convos.settings.sidebar = localStorage.getItem("sidebar") || "";
   Convos.settings.mainMenuVisible = false;
diff --git a/assets/js/vue/mixin-message.js b/assets/js/vue/mixin-message.js
index 7ec88c395..b72f5ec03 100644
--- a/assets/js/vue/mixin-message.js
+++ b/assets/js/vue/mixin-message.js
@@ -46,9 +46,11 @@
         return this.msg.message.xmlEscape().autoLink({
           target: "_blank",
           after:  function(url, id) {
-            $.get("/api/embed?url=" + encodeURIComponent(url), function(html, textStatus, xhr) {
-              self.loadOffScreen(html, id);
-            });
+            if (self.settings.expandUrls) {
+              $.get("/api/embed?url=" + encodeURIComponent(url), function(html, textStatus, xhr) {
+                self.loadOffScreen(html, id);
+              });
+            }
           }
         });
       },
diff --git a/assets/vue/convos-profile.vue b/assets/vue/convos-profile.vue
index 833d9d178..90e8800d4 100644
--- a/assets/vue/convos-profile.vue
+++ b/assets/vue/convos-profile.vue
@@ -26,6 +26,12 @@
           <label for="form_notifications">Enable notifications</label>
         </div>
       </div>
+      <div class="row">
+        <div class="col s12">
+          <input v-model="settings.expandUrls" type="checkbox" class="filled-in" id="form_expand_urls">
+          <label for="form_expand_urls">Expand URL to media</label>
+        </div>
+      </div>
       <div class="row" v-if="errors.length">
         <div class="col s12"><div class="alert">{{errors[0].message}}</div></div>
       </div>