diff --git a/grafana/meta/salt.yml b/grafana/meta/salt.yml
index 50c001f..3c00ab7 100644
--- a/grafana/meta/salt.yml
+++ b/grafana/meta/salt.yml
@@ -17,7 +17,7 @@ grain:
 {%- endif %}
 
 minion:
-  {%- if pillar.grafana.client is defined %}
+  {%- if pillar.get('grafana', {}).client is defined %}
   grafana:
     {%- from "grafana/map.jinja" import client with context %}
     grafana_version: {{ client.server.get('version', 3) }}