diff --git a/setup/so-setup b/setup/so-setup
index ea8c0e7bc..e4af88205 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -457,8 +457,6 @@ fi
 	if [[ $is_minion ]]; then
 		set_progress_str 20 'Accepting Salt key on manager'
 		accept_salt_key_remote >> $setup_log 2>&1
-		set_progress_str 21 'Checking if the Salt Minion needs to be updated'
-		salt-call state.apply salt.minion -l info >> $setup_log 2>&1
 	fi
 
 	if [[ $is_manager ]]; then
@@ -466,9 +464,14 @@ fi
 		salt-key -ya "$MINION_ID" >> $setup_log 2>&1
 	fi
 
-	set_progress_str 22 'Copying minion pillars to manager'
+	set_progress_str 21 'Copying minion pillars to manager'
 	copy_minion_tmp_files >> $setup_log 2>&1
 
+	if [[ $is_minion ]]; then
+		set_progress_str 22 'Checking if the Salt Minion needs to be updated'
+		salt-call state.apply salt.minion -l info >> $setup_log 2>&1
+	fi
+
 	set_progress_str 23 'Generating CA and checking in'
 	salt_checkin >> $setup_log 2>&1