diff --git a/sensu/files/client.json b/sensu/files/client.json
index 37a01c6..f2c10be 100644
--- a/sensu/files/client.json
+++ b/sensu/files/client.json
@@ -36,6 +36,11 @@
     {%- if pillar.get('keystone', {}).client is defined %}
     {%- if pillar.keystone.client.enabled %}
     {%- from "keystone/map.jinja" import client with context %}
+    {%- if client.server.tenant is defined
+        and client.server.user is defined
+        and client.server.password is defined
+        and client.server.host is defined
+        and client.server.public_port is defined %}
     "openstack": {
       "tenant": "{{ client.server.tenant }}",
       "user": "{{ client.server.user }}",
@@ -45,6 +50,7 @@
     },
     {%- endif %}
     {%- endif %}
+    {%- endif %}
     "keepalive": {
       "thresholds": {
         "warning": {{ client.get('keepalive_warning', '120') }},