diff --git a/salt/common/tools/sbin/so-common b/salt/common/tools/sbin/so-common
index 676b908ce..340525272 100755
--- a/salt/common/tools/sbin/so-common
+++ b/salt/common/tools/sbin/so-common
@@ -419,6 +419,20 @@ valid_proxy() {
 	[[ $has_prefix == true ]] && [[ $valid_url == true ]] && return 0 || return 1
 }
 
+valid_ntp_list() {
+	local string=$1
+	local ntp_arr
+	IFS="," read -r -a ntp_arr <<< "$string"
+
+	for ntp in "${ntp_arr[@]}"; do
+		if ! valid_ip4 "$ntp" && ! valid_hostname "$ntp" && ! valid_fqdn "$ntp"; then
+			return 1
+		fi
+	done
+
+	return 0
+}
+
 valid_string() {
 	local str=$1
 	local min_length=${2:-1}
diff --git a/setup/so-functions b/setup/so-functions
index c2ddb2125..6dd10096b 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -489,10 +489,17 @@ collect_node_ls_pipeline_worker_count() {
 collect_ntp_servers() {
 	if [[ $is_airgap || "$NSMSETUP" = 'ADVANCED' || "$MANAGERADV" = 'ADVANCED' || -n $so_proxy ]]; then
 		if whiptail_ntp_ask; then
-			[[ $is_airgap ]] && ntp_servers=""
-			whiptail_ntp_servers "$ntp_servers"
+			[[ $is_airgap ]] && ntp_servers=()
+			whiptail_ntp_servers "$ntp_string"
+
+			while ! valid_ntp_list "$ntp_string"; do
+				whiptail_invalid_input
+				whiptail_ntp_servers "$ntp_string"
+			done
+
+			IFS="," read -r -a ntp_servers <<< "$ntp_string" # Split string on commas into array
 		else
-			ntp_servers=""
+			ntp_servers=()
 		fi
 	fi
 }
diff --git a/setup/so-setup b/setup/so-setup
index 07eb49500..d9e64105a 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -584,7 +584,7 @@ set_redirect >> $setup_log 2>&1
 	# Show initial progress message
 	set_progress_str 0 'Running initial configuration steps'
 
-	[[ -z $ntp_configured ]] && [[ -n $ntp_servers ]] && configure_ntp >> $setup_log 2>&1
+	[[ -z $ntp_configured ]] && [[ ${#ntp_servers[@]} -gt 0 ]] && configure_ntp >> $setup_log 2>&1
 
 	reserve_ports
 	
diff --git a/setup/so-variables b/setup/so-variables
index 0a07fc79d..676cba4f0 100644
--- a/setup/so-variables
+++ b/setup/so-variables
@@ -73,5 +73,5 @@ export install_opt_file
 net_init_file=/root/net_init
 export net_init_file
 
-ntp_servers="0.pool.ntp.org,1.pool.ntp.org"
-export ntp_servers
+ntp_string="0.pool.ntp.org,1.pool.ntp.org"
+export ntp_string
diff --git a/setup/so-whiptail b/setup/so-whiptail
index 2743ab65b..00397a6fa 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -1119,8 +1119,6 @@ whiptail_ntp_servers() {
 
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus
-
-	IFS="," read -r -a ntp_servers <<< "$ntp_string" # Split string on commas into array
 }
 
 whiptail_oinkcode() {