diff --git a/index.html b/index.html
index ca9e392..4382dce 100644
--- a/index.html
+++ b/index.html
@@ -244,7 +244,7 @@
               <td class="prefix"><a ng-click="addMention(bufferline.prefix)"><span ng-repeat="part in ::bufferline.prefix" ng-class="::part.classes" ng-bind="::part.text"></span></a></td><!--
            --><td class="message"><!--
              --><div ng-repeat="metadata in ::bufferline.metadata" plugin data="::metadata"></div><!--
-             --><span ng-repeat="part in ::bufferline.content" class="text" ng-class="::part.classes" ng-bind-html="::part.text | linky:'_system' | linksForCordova | DOMfilter:'irclinky' | DOMfilter:'emojify':enableJSEmoji | DOMfilter:'inlinecolour' "></span>
+             --><span ng-repeat="part in ::bufferline.content" class="text" ng-class="::part.classes" ng-bind-html="::part.text | linky:'_system' | linksForCordova | DOMfilter:'irclinky' | DOMfilter:'inlinecolour' "></span>
               </td>
             </tr>
             <tr class="readmarker" ng-if="activeBuffer().lastSeen==$index">
@@ -391,16 +391,6 @@
                   </div>
                 </form>
               </li>
-              <li>
-                <form class="form-inline" role="form">
-                  <div class="checkbox">
-                    <label>
-                      <input type="checkbox" ng-model="enableJSEmoji">
-                      Enable non-native Emoji support <span class="text-muted settings-help">Displays Emoji characters as images</span>
-                    </label>
-                  </div>
-                </form>
-              </li>
             </ul>
           </div>
           <div class="modal-footer">
diff --git a/js/filters.js b/js/filters.js
index 6c4e18a..a6f7271 100644
--- a/js/filters.js
+++ b/js/filters.js
@@ -148,15 +148,4 @@ weechat.filter('getBufferQuickKeys', function () {
     };
 });
 
-// Emojifis the string using https://github.com/twitter/twemoji
-weechat.filter('emojify', function() {
-    return function(text, enable_JS_Emoji) {
-        if (enable_JS_Emoji === true) {
-            return twemoji.parse(text);
-        } else {
-            return(text);
-        }
-    };
-});
-
 })();