diff --git a/setup/so-setup b/setup/so-setup
index 84e94e780..e2c866964 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -585,7 +585,6 @@ set_redirect >> $setup_log 2>&1
 	set_progress_str 0 'Running initial configuration steps'
 
 	[[ ${#ntp_servers[@]} -gt 0 ]] && configure_ntp >> $setup_log 2>&1
-	ntp_pillar >> $setup_log 2>&1
 
 	reserve_ports
 	
@@ -619,6 +618,8 @@ set_redirect >> $setup_log 2>&1
 	fi
 
 	host_pillar >> $setup_log 2>&1
+	ntp_pillar >> $setup_log 2>&1
+
 
 	if [[ $is_minion || $is_import ]]; then
 		set_updates >> $setup_log 2>&1