diff --git a/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
index 401d757bfa8..c52e4c5e839 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
@@ -26,6 +26,11 @@ export default Ember.Controller.extend(PreferencesTabController, {
     return listThemes(this.site);
   }.property(),
 
+  @computed("userSelectableThemes")
+  showThemeSelector(themes) {
+    return themes && themes.length > 1;
+  },
+
   @observes("model.user_option.theme_key")
   themeKeyChanged() {
     let key = this.get("model.user_option.theme_key");
diff --git a/app/assets/javascripts/discourse/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
index c6e822b2cea..b8266e906bf 100644
--- a/app/assets/javascripts/discourse/templates/preferences/interface.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
@@ -1,4 +1,4 @@
-{{#if userSelectableThemes}}
+{{#if showThemeSelector}}
 <div class="control-group theme">
   <label class="control-label">{{i18n 'user.theme'}}</label>
   <div class="controls">