diff --git a/salt/logstash/files/dynamic/9999_output_redis.conf b/salt/logstash/files/dynamic/9999_output_redis.conf
index 7a39959ce..2748209ea 100644
--- a/salt/logstash/files/dynamic/9999_output_redis.conf
+++ b/salt/logstash/files/dynamic/9999_output_redis.conf
@@ -1,8 +1,9 @@
-{%- set master = grains['master'] %}
 {%- if salt['grains.get']('role') == 'so-master' %}
+{%- set master = salt['pillar.get']('master:mainip', '') -%}
 {%- set nodetype = 'master' %}
 {%- else %}
 {%- set nodetype = salt['pillar.get']('node:node_type', 'storage') %}
+{%- set master = grains['master'] %}
 {%- endif %}
 output {
 	redis {