diff --git a/salt/elasticfleet/tools/sbin/so-elastic-agent-install b/salt/elasticfleet/tools/sbin/so-elastic-agent-install
index 920b17137..bda8306f0 100644
--- a/salt/elasticfleet/tools/sbin/so-elastic-agent-install
+++ b/salt/elasticfleet/tools/sbin/so-elastic-agent-install
@@ -33,8 +33,6 @@ uninstall_agent() {
     fi
 }
 
-uninstall_agent
-
 if [[ -z "$GRIDNODETOKEN" ]]; then
     noderole=$(so-yaml.py get -r /etc/salt/grains role)
     if [[ "$noderole" == "so-heavynode" ]]; then
@@ -55,6 +53,8 @@ if [[ ! -x /opt/so/so-elastic-agent_linux_amd64 ]]; then
     salt-call state.sls_id pull_agent_installer elasticfleet.install_agent_grid queue=True
 fi
 
+uninstall_agent
+
 if [[ -x /opt/so/so-elastic-agent_linux_amd64 ]]; then
     attempts=0
     cd /opt/so/ || exit 1