diff --git a/app/controllers/template_options_controller.rb b/app/controllers/template_options_controller.rb
index fcd65b68f4..adda1d8ea2 100644
--- a/app/controllers/template_options_controller.rb
+++ b/app/controllers/template_options_controller.rb
@@ -61,7 +61,7 @@ def index
     # Always use the default template
     if Template.default.present? && org.present?
       customization = Template.published.latest_customized_version(Template.default.family_id, org.id).first
-      customization ||= Template.default
+      customization = Template.default unless customization.present? && !customization.upgrade_customization?
       @templates.select! { |t| t.id != Template.default.id && t.id != customization.id }
       # We want the default template to appear at the beggining of the list
       @templates.unshift(customization)