diff --git a/src/locales/en.json b/src/locales/en.json
index 5469611f..a46d196e 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -91,6 +91,7 @@
     "details": "Details",
     "domain_dns_conf_is_just_a_recommendation": "This page shows you the *recommended* configuration. It does *not* configure the DNS for you. It is your responsability to configure your DNS zone in your DNS registrar according to this recommendation.",
     "diagnosis": "Diagnosis",
+    "diagnosis_experimental_disclaimer": "Be aware that the diagnosis feature is still experimental and being polished, and it may not be fully reliable.",
     "disable": "Disable",
     "disabled": "Disabled",
     "dns": "DNS",
diff --git a/src/views/diagnosis/diagnosis_show.ms b/src/views/diagnosis/diagnosis_show.ms
index 4a904b48..820ac417 100644
--- a/src/views/diagnosis/diagnosis_show.ms
+++ b/src/views/diagnosis/diagnosis_show.ms
@@ -11,6 +11,8 @@
 
 <div class="separator"></div>
 
+<div class="alert alert-warning">{{t 'diagnosis_experimental_disclaimer'}}</div>
+
 {{#reports}}
 <div class="panel panel-default">
     <div class="panel-heading">