diff --git a/templates/useroptions.jade b/templates/useroptions.jade
index c2258bca..d33607ef 100644
--- a/templates/useroptions.jade
+++ b/templates/useroptions.jade
@@ -113,6 +113,7 @@ mixin us-chat
             option(value="onlyping") Only when I am mentioned or PMed
             option(value="always") Always
       mixin rcheckbox("us-sendbtn", "Add a send button to chat")
+      mixin rcheckbox("us-no-emotes", "Disable chat emotes")
 
 mixin us-mod
   #us-mod.tab-pane
diff --git a/www/js/util.js b/www/js/util.js
index b9bde3c5..166f7fc4 100644
--- a/www/js/util.js
+++ b/www/js/util.js
@@ -624,6 +624,7 @@ function showUserOptions() {
     $("#us-blink-title").val(USEROPTS.blink_title);
     $("#us-ping-sound").val(USEROPTS.boop);
     $("#us-sendbtn").prop("checked", USEROPTS.chatbtn);
+    $("#us-no-emotes").prop("checked", USEROPTS.no_emotes);
 
     $("#us-modflair").prop("checked", USEROPTS.modhat);
     $("#us-joinmessage").prop("checked", USEROPTS.joinmessage);
@@ -657,6 +658,7 @@ function saveUserOptions() {
     USEROPTS.blink_title          = $("#us-blink-title").val();
     USEROPTS.boop                 = $("#us-ping-sound").val();
     USEROPTS.chatbtn              = $("#us-sendbtn").prop("checked");
+    USEROPTS.no_emotes            = $("#us-no-emotes").prop("checked");
 
     if (CLIENT.rank >= 2) {
         USEROPTS.modhat      = $("#us-modflair").prop("checked");