diff --git a/setup/so-whiptail b/setup/so-whiptail
index eccf8c69c..2522e65f9 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -574,7 +574,7 @@ whiptail_end_settings() {
 	# ADVANCED
 	if [[ $MANAGERADV == 'ADVANCED' ]]; then
 		__append_end_msg "Advanced Manager Settings:"
-		__append_end_msg "  ES Cluster Name: $ESCLUSTERNAME"
+		[[ -n $ESCLUSTERNAME ]] && __append_end_msg "  ES Cluster Name: $ESCLUSTERNAME"
 		if [[ ${#BLOGS[@]} -gt 0 ]]; then
 			__append_end_msg "  Zeek Logs Enabled:"
 			for log in "${BLOGS[@]}"; do