diff --git a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/registry.yml b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/registry.yml
index 14a4c85..736e428 100644
--- a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/registry.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/registry.yml
@@ -13,7 +13,9 @@
     url: https://registry.{{ vapp['metacluster.fqdn'] }}/api/v2.0/health
     method: GET
   register: api_readycheck
-  until: api_readycheck.json.status == 'healthy'
+  until:
+    - api_readycheck.json.status is defined
+    - api_readycheck.json.status == 'healthy'
   retries: 5
   delay: 30