diff --git a/defaults/main.yml b/defaults/main.yml
index d2d9dd86..5a9cb4b7 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -264,7 +264,7 @@ horizon_keystone_default_domain: Default
 # Option to set the available domains to choose from. This is
 # a list of pairs whose first value is the domain name and the
 # second is the display name.
-horizon_keystone_multidomain_choices: "(('{{ horizon_keystone_default_domain }}', '{{ horizon_keystone_default_domain }}'))"
+horizon_keystone_multidomain_choices: "(('{{ horizon_keystone_default_domain }}', '{{ horizon_keystone_default_domain }}'),)"
 
 # Enable/disable v2 openrc file download in horizon.
 horizon_show_keystone_v2_rc: True
diff --git a/templates/horizon_local_settings.py.j2 b/templates/horizon_local_settings.py.j2
index 47433d37..fd8f59e4 100644
--- a/templates/horizon_local_settings.py.j2
+++ b/templates/horizon_local_settings.py.j2
@@ -90,7 +90,9 @@ OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = {{ horizon_keystone_multidomain_support
 OPENSTACK_KEYSTONE_DEFAULT_DOMAIN = "{{ horizon_keystone_default_domain }}"
 {%   else %}
 OPENSTACK_KEYSTONE_DOMAIN_DROPDOWN = {{ horizon_keystone_multidomain_dropdown | bool }}
+{%     if horizon_keystone_multidomain_dropdown %}
 OPENSTACK_KEYSTONE_DOMAIN_CHOICES = {{ horizon_keystone_multidomain_choices }}
+{%     endif %}
 {%   endif %}
 {% endif %}