diff --git a/index.html b/index.html
index 0e03aea..2e9cf11 100644
--- a/index.html
+++ b/index.html
@@ -259,7 +259,7 @@
               <td class="prefix"><a ng-click="addMention(bufferline.prefix)"><span class="hidden-bracket">&lt;</span><span ng-repeat="part in ::bufferline.prefix" ng-class="::part.classes" ng-bind="::part.text|prefixlimit:25"></span><span class="hidden-bracket">&gt;</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.concat(['line-' + part.$$hashKey.replace(':','_')])" ng-bind-html="::part.text | linky:'_system' | linksForCordova | DOMfilter:'irclinky' | DOMfilter:'inlinecolour' | DOMfilter:'mathjax':('.line-' + part.$$hashKey.replace(':','_')):settings.enableMathjax"></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">
@@ -420,16 +420,6 @@
                   </div>
                 </form>
               </li>
-              <li>
-                <form class="form-inline" role="form">
-                  <div class="checkbox">
-                    <label>
-                      <input type="checkbox" ng-model="settings.enableMathjax">
-                      Enable LaTeX math rendering
-                    </label>
-                  </div>
-                </form>
-              </li>
             </ul>
           </div>
           <div class="modal-footer">
diff --git a/js/filters.js b/js/filters.js
index ee2e321..db04d2f 100644
--- a/js/filters.js
+++ b/js/filters.js
@@ -166,21 +166,6 @@ weechat.filter('getBufferQuickKeys', function () {
     };
 });
 
-weechat.filter('mathjax', function() {
-    return function(text, selector, enabled) {
-        if (!enabled || typeof(MathJax) === "undefined") {
-            return text;
-        }
-        if (text.indexOf("$$") != -1 || text.indexOf("\\[") != -1 || text.indexOf("\\(") != -1) {
-            // contains math
-            var math = document.querySelector(selector);
-            MathJax.Hub.Queue(["Typeset",MathJax.Hub,math]);
-        }
-
-        return text;
-    };
-});
-
 weechat.filter('prefixlimit', function() {
     return function(input, chars) {
         if (isNaN(chars)) return input;
diff --git a/js/glowingbear.js b/js/glowingbear.js
index df25490..d2631d7 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -44,7 +44,6 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         'fontsize': '14px',
         'fontfamily': (utils.isMobileUi() ? 'sans-serif' : 'Inconsolata, Consolas, Monaco, Ubuntu Mono, monospace'),
         'readlineBindings': false,
-        'enableMathjax': false,
         'customCSS': '',
     });
     $scope.settings = settings;
@@ -352,31 +351,6 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
     });
 
 
-    // To prevent unnecessary loading times for users who don't
-    // want MathJax, load it only if the setting is enabled.
-    // This also fires when the page is loaded if enabled.
-    settings.addCallback('enableMathjax', function(enabled) {
-        if (enabled && !$rootScope.mathjax_init) {
-            // Load MathJax only once
-            $rootScope.mathjax_init = true;
-            (function () {
-                var head = document.getElementsByTagName("head")[0], script;
-                script = document.createElement("script");
-                script.type = "text/x-mathjax-config";
-                script[(window.opera ? "innerHTML" : "text")] =
-                    "MathJax.Hub.Config({\n" +
-                    "  tex2jax: { inlineMath: [['$$','$$'], ['\\\\(','\\\\)']], displayMath: [['\\\\[','\\\\]']] },\n" +
-                    "});";
-                head.appendChild(script);
-                script = document.createElement("script");
-                script.type = "text/javascript";
-                script.src  = "//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS_HTML";
-                head.appendChild(script);
-            })();
-        }
-    });
-
-
     // Inject theme CSS
     settings.addCallback('theme', function(theme) {
         // Unload old theme