diff --git a/setup/so-whiptail b/setup/so-whiptail
index b4e954b85..46fbf3ff7 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -630,14 +630,16 @@ whiptail_end_settings() {
 		__append_end_msg "  Logstash Batch Size: $LSPIPELINEBATCH"
 		__append_end_msg "  Logstash Input Threads: $LSINPUTTHREADS"
 	else
-		if [[ ! $is_receiver ]]; then
-			__append_end_msg "Elasticsearch Heap Size: $NODE_ES_HEAP_SIZE"
-			__append_end_msg "Elasticsearch Storage Space: ${log_size_limit}GB"
+		if [[ ! $is_analyst ]]; then
+			if [[ ! $is_receiver ]]; then
+				__append_end_msg "Elasticsearch Heap Size: $NODE_ES_HEAP_SIZE"
+				__append_end_msg "Elasticsearch Storage Space: ${log_size_limit}GB"
+			fi
+			__append_end_msg "Logstash Heap Size: $NODE_LS_HEAP_SIZE"
+			__append_end_msg "Logstash Worker Count: $LSPIPELINEWORKERS"
+			__append_end_msg "Logstash Batch Size: $LSPIPELINEBATCH"
+			__append_end_msg "Logstash Input Threads: $LSINPUTTHREADS"
 		fi
-		__append_end_msg "Logstash Heap Size: $NODE_LS_HEAP_SIZE"
-		__append_end_msg "Logstash Worker Count: $LSPIPELINEWORKERS"
-		__append_end_msg "Logstash Batch Size: $LSPIPELINEBATCH"
-		__append_end_msg "Logstash Input Threads: $LSINPUTTHREADS"
 	fi