diff --git a/salt/wazuh/files/agent/wazuh-register-agent b/salt/wazuh/files/agent/wazuh-register-agent
index 98ab9fb13..21c3c2f05 100755
--- a/salt/wazuh/files/agent/wazuh-register-agent
+++ b/salt/wazuh/files/agent/wazuh-register-agent
@@ -60,8 +60,14 @@ register_agent() {
   GOT_KEY=$?
 
   if [[ -z "$AGENT_ID" || -z "$AGENT_KEY" || $GOT_ID -ne 0 || $GOT_KEY -ne 0 ]]; then
-    echo "Failed Result: $API_RESULT"
-    return 1
+    if echo "$API_RESULT" | jq -er .message | grep -q "There is an agent with the same name"; then
+      echo "Agent $AGENT_NAME already registered!"
+      touch /opt/so/conf/wazuh/initial_agent_registration.log
+      exit 0
+    else
+      echo "Failed Result: $API_RESULT"
+      return 1
+    fi
   else
     echo "Agent '$AGENT_NAME' with ID '$AGENT_ID' added."
     echo "Key for agent '$AGENT_ID' received."