diff --git a/setup/so-setup b/setup/so-setup
index e890853f5..4aaab8ade 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -737,7 +737,7 @@ echo "1" > /root/accept_changes
 		fi
 	fi
 
-	if [[ $is_node || $is_receiver ]]; then
+	if [[ ($is_node || $is_receiver) && !($is_manager || $is_helix) ]]; then
 		set_progress_str 19 'Generating logstash pillar'
 		logstash_pillar >> $setup_log 2>&1
 	fi