diff --git a/backupninja/meta/salt.yml b/backupninja/meta/salt.yml
index 89db0df..41080b9 100644
--- a/backupninja/meta/salt.yml
+++ b/backupninja/meta/salt.yml
@@ -3,4 +3,7 @@
     {%- if pillar.get('backupninja', {}).get('client') %}
     {%- from "backupninja/map.jinja" import service_grains with context %}
     {{ service_grains|yaml(False)|indent(4) }}
+    {%- else %}
+    backupninja:
+      backup: {}
     {%- endif %}
diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index 5e12c47..006b6ed 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -8,6 +8,6 @@
       heka:
         enabled: true
       sensu:
-        enabled: true
+        enabled: false
       sphinx:
         enabled: true