diff --git a/salt/logstash/init.sls b/salt/logstash/init.sls
index f17640343..f687909ff 100644
--- a/salt/logstash/init.sls
+++ b/salt/logstash/init.sls
@@ -15,6 +15,11 @@
 
 # Logstash Section
 
+{% if grains['role'] == 'so-sensor' %}
+{% set lsheap = salt['pillar.get']('sensor:lsheap', '') %}
+{% else %}
+{% set lsheap = salt['pillar.get']('master:lsheap', '') %}
+{% endif %}
 logstashgroup:
   group.present:
     - name: logstash