diff --git a/setup/so-functions b/setup/so-functions
index fab24b2f2..cb7e447ea 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1200,13 +1200,14 @@ manager_global() {
 		"  features: False"\
 		"elasticsearch:"\
 		"  replicas: 0"\
-		if [[ -z "$ESCLUSTERNAME" ]]; then 
-		    printf "  true_cluster: False"
-		           "  true_cluster_name: 'so'"
+		if [ -n "$ESCLUSTERNAME" ]; then 
+		    printf "  true_cluster: True"\
+		           "  true_cluster_name: '$ESCLUSTERNAME'"\
 		else
-			printf "  true_cluster: True"
-				   "  true_cluster_name: '$ESCLUSTERNAME'"
+			printf "  true_cluster: False"\
+				   "  true_cluster_name: 'so'"\
 		fi
+		
 		"  discovery_nodes: 1"\
 		"  hot_warm_enabled: False"\
 		"  cluster_routing_allocation_disk.threshold_enabled: true"\