diff --git a/public/js/main.js b/public/js/main.js
index 657a4909..4d5b47d7 100644
--- a/public/js/main.js
+++ b/public/js/main.js
@@ -1,10 +1,4 @@
 // Night mode
-var night = localStorage.getItem("night");
-if (night == "true") {
-    $("#style")[0].href = "/css/style-night.css";
-    $("#nighticon")[0].src = "/img/sun.png";
-}
-
 function toggleNightMode() {
     var night = localStorage.getItem("night");
     if(night == "true") {
diff --git a/templates/index.html b/templates/index.html
index 9b6c3391..eef8f1d1 100755
--- a/templates/index.html
+++ b/templates/index.html
@@ -27,6 +27,15 @@
 
     <!-- Website CSS -->
     <link rel="stylesheet" id="style" href="{{.URL.Parse "/css/style.css"}}">
+    <script type="text/javascript">
+        // Inlined here to allow early style switch
+        if (localStorage.getItem("night") == "true") {
+            document.getElementById("style").href = "/css/style-night.css";
+            document.body.addEventListener("load", function() {
+                document.getElementById("nighticon").src = "/img/sun.png";
+            }, false);
+        }
+    </script>
   </head>
   <body>
       <nav class="navbar navbar-default" id="mainmenu">
