diff --git a/heka/server.sls b/heka/server.sls
index 3a8f855..49145ec 100644
--- a/heka/server.sls
+++ b/heka/server.sls
@@ -148,8 +148,8 @@
 
 {%- for service_name, service in pillar.items() %}
 {%- for role_name, role in service.iteritems() %}
-{%- if role.logging is defined %}
-{%- if role.logging.get('heka', {}).get('enabled', False) %}
+{%- if role.logging is defined and role.logging.heka is defined %}
+{%- if role.logging.heka.get('enabled', False) %}
 
 /etc/heka/conf.d/99-{{ service_name }}-{{ role_name }}.toml:
   file.managed: