diff --git a/static/js/pandora.js b/static/js/pandora.js
index 0808c813..5f89f70e 100644
--- a/static/js/pandora.js
+++ b/static/js/pandora.js
@@ -249,7 +249,7 @@ appPanel
             videoFormat: Ox.UI.getVideoFormat(pandora.site.video.formats)
         });
 
-        if (data.user.level == 'guest' && $.browser.mozilla) {
+        if (data.user.level == 'guest' && $.browser.mozilla && !localStorage.theme) {
             pandora.user.ui.theme = 'classic';
         }