diff --git a/src/Tinter.js b/src/Tinter.js
index 1b2416762f..c926ada591 100644
--- a/src/Tinter.js
+++ b/src/Tinter.js
@@ -217,7 +217,7 @@ class Tinter {
         // cache our fixups
         if (this.cssFixups[this.theme]) return;
 
-        if (DEBUG) console.trace("calcCssFixups start for " + this.theme + " (checking " +
+        if (DEBUG) console.debug("calcCssFixups start for " + this.theme + " (checking " +
                                  document.styleSheets.length + 
                                  " stylesheets)");
 
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index f2df1df851..26eed952d8 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -931,7 +931,17 @@ module.exports = React.createClass({
             Tinter.tint(colors[0], colors[1]);
         };
 
-        if (styleElements[theme].complete) {
+        let cssLoaded = false;
+
+        for (let i = 0; i < document.styleSheets.length; i++) {
+            const ss = document.styleSheets[i];
+            if (ss && ss.href === styleElements[theme].href) {
+                cssLoaded = true;
+                break;
+            }
+        }
+
+        if (cssLoaded) {
             switchTheme();
         } else {
             styleElements[theme].onload = () => {