diff --git a/neutron/agents/l2gw.sls b/neutron/agents/l2gw.sls
index 1029f1a..53e048a 100644
--- a/neutron/agents/l2gw.sls
+++ b/neutron/agents/l2gw.sls
@@ -12,13 +12,21 @@
   - require:
     - pkg: l2gw_agent_packages
 
+{%- if not grains.get('noservices', False) %}
+
+# TODO: use service.masked state instead once salt get updated to 2017.7.0+
+service.mask:
+  module.run:
+  - m_name: neutron-l2gateway-agent
+  - require_in:
+    - pkg: l2gw_agent_packages
+
 neutron-l2gateway-agent:
   service.running:
   - enable: true
-  {%- if grains.get('noservices') %}
-  - onlyif: /bin/false
-  {%- endif %}
   - watch:
     - file: /etc/neutron/l2gateway_agent.ini
+    - file: /etc/neutron/neutron.conf
 
 {%- endif %}
+{%- endif %}