diff --git a/collectd/client.sls b/collectd/client.sls
index 093bc01..de3e93a 100644
--- a/collectd/client.sls
+++ b/collectd/client.sls
@@ -52,10 +52,8 @@
 {%- set grains_fragment_file = service_name+'/meta/collectd.yml' %}
 {%- macro load_grains_file() %}{% include grains_fragment_file %}{% endmacro %}
 {%- set grains_yaml = load_grains_file()|load_yaml %}
-{%- if grains_yaml.plugin is defined %}
 {%- set _dummy = grains.collectd.plugin.update(grains_yaml.plugin) %}
 {%- endif %}
-{%- endif %}
 {%- endfor %}
 
 collectd_client_grain:
@@ -81,7 +79,7 @@
   - watch:
     - file: collectd_client_grain
 
-{%- for plugin_name, plugin in grains.plugin.iteritems() %}
+{%- for plugin_name, plugin in grains.collectd.plugin.iteritems() %}
 
 {{ client.config_dir }}/{{ plugin_name }}.conf:
   file.managed: