diff --git a/neutron/files/queens/lbaas.conf b/neutron/files/queens/lbaas.conf
index cf2fe8c..e6f48a8 100644
--- a/neutron/files/queens/lbaas.conf
+++ b/neutron/files/queens/lbaas.conf
@@ -1,6 +1,7 @@
 # LBaaS config
 
 [service_providers]
+
 {%- if server.lbaas.enabled -%}
 
 {%- for lbaas_name, lbaas in server.lbaas.providers.iteritems() %}
@@ -31,11 +32,10 @@
 
 {%- endfor -%}
 
-{% endif %}
-
 {% elif server.backend.engine == "contrail" %}
 
 service_provider = LOADBALANCERV2:Opencontrail:neutron_plugin_contrail.plugins.opencontrail.loadbalancer.driver.OpencontrailLoadbalancerDummyDriver:default
 
 {% include "neutron/files/"+server.version+"/ContrailPlugin.ini" %}
 
+{%- endif -%}
diff --git a/neutron/files/queens/neutron-server.conf b/neutron/files/queens/neutron-server.conf
index 28eff23..9d60d06 100644
--- a/neutron/files/queens/neutron-server.conf
+++ b/neutron/files/queens/neutron-server.conf
@@ -63,7 +63,6 @@
 {% endif %}
 
 service_plugins = {{ server.backend.get('router', l3_plugin)}},metering
-{%- if server.lbaas is defined -%},lbaasv2{%- endif -%}
 {%- if fwaas.get('enabled', False) -%},{{ fwaas[fwaas.api_version]['service_plugin'] }}{%- endif -%}
 {%- if server.get('qos', 'True') -%},neutron.services.qos.qos_plugin.QoSPlugin{%- endif -%}
 {%- if server.get('vlan_aware_vms', False) -%},trunk{%- endif -%}