diff --git a/app/assets/javascripts/admin/views/admin.js.es6 b/app/assets/javascripts/admin/views/admin.js.es6
index 5336e272a..f503a3406 100644
--- a/app/assets/javascripts/admin/views/admin.js.es6
+++ b/app/assets/javascripts/admin/views/admin.js.es6
@@ -1,6 +1,9 @@
 export default Discourse.View.extend({
   _disableCustomStylesheets: function() {
-    $("link.custom-css").attr("rel", "");
+    if (this.session.get("disableCustomCSS")) {
+      $("link.custom-css").attr("rel", "");
+      this.session.set("disableCustomCSS", false);
+    }
   }.on("willInsertElement"),
 
   _enableCustomStylesheets: function() {
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 20a06652e..59c8bbb7f 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -153,11 +153,14 @@ module ApplicationHelper
     MobileDetection.mobile_device?(request.user_agent)
   end
 
-
   def customization_disabled?
     session[:disable_customization]
   end
 
+  def loading_admin?
+    controller.class.name.split("::").first == "Admin"
+  end
+
   def category_badge(category, opts=nil)
     CategoryBadge.html_for(category, opts).html_safe
   end
diff --git a/app/views/common/_discourse_javascript.html.erb b/app/views/common/_discourse_javascript.html.erb
index a72accad1..737ff157e 100644
--- a/app/views/common/_discourse_javascript.html.erb
+++ b/app/views/common/_discourse_javascript.html.erb
@@ -9,7 +9,6 @@
 
 <script>
   Ember.RSVP.configure('onerror', function(e) {
-
     // Ignore TransitionAborted exceptions that bubble up
     if (e && e.message === "TransitionAborted") { return; }
 
@@ -43,6 +42,7 @@
   Discourse.Route.mapRoutes();
   Discourse.start();
   Discourse.set('assetVersion','<%= Discourse.assets_digest %>');
+  Discourse.Session.currentProp("disableCustomCSS", <%= loading_admin? %>);
 </script>
 
 <%= script 'browser-update' %>