diff --git a/src/certificate.py b/src/certificate.py
index 076a12980..45453e170 100644
--- a/src/certificate.py
+++ b/src/certificate.py
@@ -98,9 +98,13 @@ def certificate_status(domains, full=False):
         if full:
             try:
                 _check_domain_is_ready_for_ACME(domain)
-                status["ACME_eligible"] = True
-            except Exception:
-                status["ACME_eligible"] = False
+                status["acme_status"] = 'eligible'
+            except Exception as e:
+                if e.key == 'certmanager_domain_not_diagnosed_yet':
+                    status["acme_status"] = 'unknown'
+                else:
+                    status["acme_status"] = 'ineligible'
+
 
         del status["domain"]
         certificates[domain] = status
diff --git a/src/domain.py b/src/domain.py
index 034e0f935..c66924fe7 100644
--- a/src/domain.py
+++ b/src/domain.py
@@ -192,7 +192,7 @@ def domain_info(domains):
                 "certificate": {
                     "authority": certs[domain]["CA_type"]["code"],
                     "validity": certs[domain]["validity"],
-                    "ACME_eligible": certs[domain]["ACME_eligible"],
+                    "acme_status": certs[domain]["acme_status"],
                 },
                 "dns": get_dns_config(domain),
             }