diff --git a/setup/so-functions b/setup/so-functions
index 307a03d8f..0665b5a4b 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -2280,7 +2280,8 @@ set_initial_firewall_access() {
 		$default_salt_dir/salt/common/tools/sbin/so-firewall --role=analyst --ip=$ALLOW_CIDR --apply=true
 	fi
 	if [[ ! -z "$MINION_CIDR" ]]; then
-		$default_salt_dir/salt/common/tools/sbin/so-firewall --role=sensors --ip=$MINION_CIDR --apply=true
+		$default_salt_dir/salt/common/tools/sbin/so-firewall --role=sensors --ip=$MINION_CIDR --apply=false
+		$default_salt_dir/salt/common/tools/sbin/so-firewall --role=search --ip=$MINION_CIDR --apply=true
 	fi
 }