diff --git a/setup/so-functions b/setup/so-functions
index 993cf5751..f764071cc 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -103,9 +103,13 @@ add_manager_hostfile() {
 
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus
+}
 
-	# Add manager to hosts file
-	echo "$MSRVIP   $MSRV" >> /etc/hosts
+
+add_mngr_ip_to_hosts() {
+	if [[ -n "$MSRVIP" ]]; then
+		echo "$MSRVIP   $MSRV" >> /etc/hosts
+	fi
 }
 
 addtotab_generate_templates() {
diff --git a/setup/so-setup b/setup/so-setup
index c8c6dcdb2..cf180000f 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -446,7 +446,11 @@ disable_ipv6
 disable_auto_start
 
 if [[ "$setup_type" != 'iso' ]]; then
-	set_hostname >> $setup_log 2>&1
+	set_hostname
+fi
+
+if [[ $is_minion ]]; then
+	add_mngr_ip_to_hosts
 fi
 
 {