diff --git a/setup/so-functions b/setup/so-functions
index b05da56dd..df19a17b7 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1141,8 +1141,7 @@ elasticsearch_pillar() {
 		"  log_size_limit: $log_size_limit"\
 		"  node_route_type: hot"\
 		"" >> "$pillar_file"
-
-	if [ "$install_type" != 'EVAL' ] && [ "$install_type" != 'HELIXSENSOR' ] && [ "$install_type" != 'MANAGERSEARCH' ] && [ "$install_type" != 'STANDALONE' ]; then
+	
 	printf '%s\n'\
 		"logstash_settings:"\
 		"  ls_pipeline_batch_size: $LSPIPELINEBATCH"\
@@ -1150,7 +1149,6 @@ elasticsearch_pillar() {
 		"  ls_batch_count: $LSINPUTBATCHCOUNT"\
 		"  lsheap: $NODE_LS_HEAP_SIZE"\
 		"" >> "$pillar_file"
-	fi
 
 	printf '%s\n'  '----' >> "$setup_log" 2>&1
 	cat "$pillar_file" >> "$setup_log" 2>&1
diff --git a/setup/so-setup b/setup/so-setup
index e1177c21c..eab45388a 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -440,8 +440,10 @@ fi
 		set_progress_str 18 'Setting node type'
 		set_node_type >> $setup_log 2>&1
 
-		set_progress_str 19 'Generating search node pillar'
-		elasticsearch_pillar >> $setup_log 2>&1
+		if ! [[ $is_manager || $is_helix ]]; then
+			set_progress_str 19 'Generating search node pillar'
+			elasticsearch_pillar >> $setup_log 2>&1
+		fi
 	fi
 
 	if [[ $is_minion ]]; then