diff --git a/neutron/server.sls b/neutron/server.sls
index 5bf73e3..e235d1d 100644
--- a/neutron/server.sls
+++ b/neutron/server.sls
@@ -112,14 +112,11 @@
   - template: jinja
   - require:
     - pkg: neutron_server_packages
-{%- if not grains.get('noservices', False) %}
   - watch_in:
     - service: neutron_server_services
 
 {%- endif %}
 
-{%- endif %}
-
 {%- if server.backend.engine == "midonet" %}
 
 /etc/neutron/plugins/midonet/midonet.ini:
@@ -180,6 +177,9 @@
   service.running:
   - names: {{ server.services }}
   - enable: true
+  {% if grains.noservices is defined %}
+  - onlyif: {% if grains.get('noservices', "True") %}"True"{% else %}False{% endif %}
+  {% endif %}
   - watch:
     - file: /etc/neutron/neutron.conf