diff --git a/locales/en.json b/locales/en.json
index e655acb83..789ec5a4b 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -245,6 +245,7 @@
     "diagnosis_ip_no_ipv4": "The server does not have working IPv4.",
     "diagnosis_ip_no_ipv6": "The server does not have working IPv6.",
     "diagnosis_ip_no_ipv6_tip": "Having a working IPv6 is not mandatory for your server to work, but it is better for the health of the Internet as a whole. IPv6 should usually be automatically configured by the system or your provider if it's available. Otherwise, you might need to configure a few things manually as explained in the documentation here: <a href='https://yunohost.org/#/ipv6'>https://yunohost.org/#/ipv6</a>. If you cannot enable IPv6 or if it seems too technical for you, you can also safely ignore this warning.",
+    "diagnosis_ip_no_ipv6_tip_important": "IPv6 should usually be automatically configured by the system or your provider if it's available. Otherwise, you might need to configure a few things manually as explained in the documentation here: <a href='https://yunohost.org/#/ipv6'>https://yunohost.org/#/ipv6</a>.",
     "diagnosis_ip_not_connected_at_all": "The server does not seem to be connected to the Internet at all!?",
     "diagnosis_ip_weird_resolvconf": "DNS resolution seems to be working, but it looks like you're using a custom <code>/etc/resolv.conf</code>.",
     "diagnosis_ip_weird_resolvconf_details": "The file <code>/etc/resolv.conf</code> should be a symlink to <code>/etc/resolvconf/run/resolv.conf</code> itself pointing to <code>127.0.0.1</code> (dnsmasq). If you want to manually configure DNS resolvers, please edit <code>/etc/resolv.dnsmasq.conf</code>.",
diff --git a/src/diagnosers/10-ip.py b/src/diagnosers/10-ip.py
index 954b9b4e8..1d28be143 100644
--- a/src/diagnosers/10-ip.py
+++ b/src/diagnosers/10-ip.py
@@ -119,10 +119,13 @@ class MyDiagnoser(Diagnoser):
             else:
                 return local_ip
 
+        def is_ipvx_important(x):
+            return settings_get("misc.network.dns_exposure") == "both" or "ipv"+str(x)
+
         yield dict(
             meta={"test": "ipv4"},
             data={"global": ipv4, "local": get_local_ip("ipv4")},
-            status="SUCCESS" if ipv4 else "ERROR" if settings_get("misc.network.dns_exposure") == "ipv4" else "WARNING",
+            status="SUCCESS" if ipv4 else "ERROR" if is_ipvx_important(4) else "WARNING",
             summary="diagnosis_ip_connected_ipv4" if ipv4 else "diagnosis_ip_no_ipv4",
             details=["diagnosis_ip_global", "diagnosis_ip_local"] if ipv4 else None,
         )
@@ -130,11 +133,11 @@ class MyDiagnoser(Diagnoser):
         yield dict(
             meta={"test": "ipv6"},
             data={"global": ipv6, "local": get_local_ip("ipv6")},
-            status="SUCCESS" if ipv6 else "ERROR" if settings_get("misc.network.dns_exposure") == "ipv6" else "WARNING",
+            status="SUCCESS" if ipv6 else "ERROR" if is_ipvx_important(6) else "WARNING",
             summary="diagnosis_ip_connected_ipv6" if ipv6 else "diagnosis_ip_no_ipv6",
             details=["diagnosis_ip_global", "diagnosis_ip_local"]
             if ipv6
-            else ["diagnosis_ip_no_ipv6_tip"],
+            else ["diagnosis_ip_no_ipv6_tip_important" if is_ipvx_important(6) else "diagnosis_ip_no_ipv6_tip"],
         )
 
         # TODO / FIXME : add some attempt to detect ISP (using whois ?) ?