diff --git a/neutron/db/firewall/firewall_db.py b/neutron/db/firewall/firewall_db.py
index 3460ea01be8..16dbd622089 100644
--- a/neutron/db/firewall/firewall_db.py
+++ b/neutron/db/firewall/firewall_db.py
@@ -264,12 +264,11 @@ def update_firewall(self, context, id, firewall):
     def delete_firewall(self, context, id):
         LOG.debug(_("delete_firewall() called"))
         with context.session.begin(subtransactions=True):
-            fw_query = context.session.query(
-                Firewall).with_lockmode('update')
-            firewall_db = fw_query.filter_by(id=id).one()
             # Note: Plugin should ensure that it's okay to delete if the
             # firewall is active
-            context.session.delete(firewall_db)
+            count = context.session.query(Firewall).filter_by(id=id).delete()
+            if not count:
+                raise firewall.FirewallNotFound(firewall_id=id)
 
     def get_firewall(self, context, id, fields=None):
         LOG.debug(_("get_firewall() called"))