diff --git a/templates/queens/openvswitch_agent.ini b/templates/queens/openvswitch_agent.ini
index 1305eb62..74ccefa1 100644
--- a/templates/queens/openvswitch_agent.ini
+++ b/templates/queens/openvswitch_agent.ini
@@ -32,6 +32,7 @@ extensions = {{ extension_drivers }}
 enable_security_group = True
 firewall_driver = {{ firewall_driver }}
 {% else -%}
+firewall_driver = neutron.agent.firewall.NoopFirewallDriver
 enable_security_group = False
 {% endif -%}
 
diff --git a/templates/ussuri/openvswitch_agent.ini b/templates/ussuri/openvswitch_agent.ini
index 757d5219..2f42f506 100644
--- a/templates/ussuri/openvswitch_agent.ini
+++ b/templates/ussuri/openvswitch_agent.ini
@@ -34,6 +34,7 @@ explicitly_egress_direct = True
 enable_security_group = True
 firewall_driver = {{ firewall_driver }}
 {% else -%}
+firewall_driver = neutron.agent.firewall.NoopFirewallDriver
 enable_security_group = False
 {% endif -%}