diff --git a/salt/logstash/init.sls b/salt/logstash/init.sls
index f7adc1330..3bc539b35 100644
--- a/salt/logstash/init.sls
+++ b/salt/logstash/init.sls
@@ -7,7 +7,10 @@
 {% from 'kafka/map.jinja' import KAFKAMERGED %}
 
 include:
-{% if LOGSTASH_MERGED.enabled and not KAFKAMERGED.enabled %}
+{# Disable logstash when Kafka is enabled except when the role is standalone #}
+{% if LOGSTASH_MERGED.enabled and grains.role == 'so-standalone' %}
+  - logstash.enabled
+{% elif LOGSTASH_MERGED.enabled and not KAFKAMERGED.enabled %}
   - logstash.enabled
 {% else %}
   - logstash.disabled