diff --git a/setup/so-setup b/setup/so-setup
index bfd3d506c..ff8792e9a 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -257,9 +257,6 @@ if [[ $is_master ]]; then
 	whiptail_enable_components
 	if [[ $STRELKA == 1 ]]; then
 	    whiptail_strelka_rules
-		if [[ $STRELKARULES == 1 ]]; then
-			strelka_yara_update
-		fi
 	fi
 	collect_webuser_inputs
 	get_redirect
@@ -554,6 +551,9 @@ fi
 	if [[ "$STRELKA" = 1 ]]; then
 		set_progress_str 77 "$(print_salt_state_apply 'strelka')"
 		salt-call state.apply -l info strelka >> $setup_log 2>&1
+		if [[ $STRELKARULES == 1 ]]; then
+			/usr/sbin/so-yara-update >> $setup_log 2>&1	
+		fi
 	fi
 
 	if [[ "$PLAYBOOK" = 1 ]]; then