diff --git a/ansible-wazuh-agent/tasks/main.yml b/ansible-wazuh-agent/tasks/main.yml
index c9af9802..bba005aa 100644
--- a/ansible-wazuh-agent/tasks/main.yml
+++ b/ansible-wazuh-agent/tasks/main.yml
@@ -28,7 +28,10 @@
 
 - name: Verify agent registration
   shell: echo {{ agent_auth_output }} | grep "Valid key created"
-  when: wazuh_register_client == true
+  when:
+    - wazuh_register_client == true
+    - check_keys.stat.size == 0
+    - wazuh_manager_ip is not none
   tags:
     - config