diff --git a/kibana/server.sls b/kibana/server.sls
index be45f86..09eb896 100644
--- a/kibana/server.sls
+++ b/kibana/server.sls
@@ -5,17 +5,16 @@
   pkg.installed:
     - name: {{ server.pkgname }}
 
-{%- if not grains.get('noservices', False) %}
-
 kibana_service:
   service.running:
   - enable: true
   - name: {{ server.service }}
+  {%- if grains.get('noservices') %}
+  - onlyif: /bin/false
+  {%- endif %}
   - watch:
     - file: {{ server.configpath }}
 
-{%- endif %}
-
 {{ server.configpath }}:
   file.managed:
   - source: salt://kibana/files/kibana.yml