diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index b51061359ba..fcd933553ca 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -105,16 +105,14 @@
     {{#d-button action="addUploadModal" icon="plus"}}{{i18n "admin.customize.theme.add"}}{{/d-button}}
   </p>
 
+  {{#if hasSettings}}
   <h3>{{i18n "admin.customize.theme.theme_settings"}}</h3>
   {{#d-section class="form-horizontal theme settings"}}
-    {{#if hasSettings}}
-      {{#each settings as |setting|}}
-        {{theme-setting setting=setting model=model class="theme-setting"}}
-      {{/each}}
-    {{else}}
-      {{i18n "admin.customize.theme.no_settings"}}
-    {{/if}}
+    {{#each settings as |setting|}}
+      {{theme-setting setting=setting model=model class="theme-setting"}}
+    {{/each}}
   {{/d-section}}
+  {{/if}}
 
   {{#if availableChildThemes}}
     <h3>{{i18n "admin.customize.theme.theme_components"}}</h3>