diff --git a/ghost/admin/app/services/feature.js b/ghost/admin/app/services/feature.js
index ae133045d3..ad792d4533 100644
--- a/ghost/admin/app/services/feature.js
+++ b/ghost/admin/app/services/feature.js
@@ -119,7 +119,11 @@ export default Service.extend({
     },
 
     _setAdminTheme(enabled) {
-        let nightShift = enabled || this.get('nightShift');
+        let nightShift = enabled;
+
+        if (typeof nightShift === 'undefined') {
+            nightShift = enabled || this.get('nightShift');
+        }
 
         return this.get('lazyLoader').loadStyle('dark', 'assets/ghost-dark.css', true).then(() => {
             $('link[title=dark]').prop('disabled', !nightShift);