diff --git a/locales/en.json b/locales/en.json
index fcc603f41..1bf83469e 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -159,6 +159,7 @@
     "diagnosis_ip_no_ipv4": "The server does not have working IPv4.",
     "diagnosis_ip_connected_ipv6": "The server is connected to the Internet through IPv6 !",
     "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_global": "Global IP: <code>{global}</code>",
     "diagnosis_ip_local": "Local IP: <code>{local}</code>",
     "diagnosis_ip_not_connected_at_all": "The server does not seem to be connected to the Internet at all!?",
diff --git a/src/yunohost/utils/network.py b/src/yunohost/utils/network.py
index ef6378692..2da758886 100644
--- a/src/yunohost/utils/network.py
+++ b/src/yunohost/utils/network.py
@@ -27,7 +27,6 @@ import dns.resolver
 from moulinette.utils.filesystem import read_file, write_to_file
 from moulinette.utils.network import download_text
 from moulinette.utils.process import check_output
-from moulinette.utils.filesystem import read_file
 
 logger = logging.getLogger('yunohost.utils.network')
 
@@ -113,6 +112,10 @@ def external_resolvers():
     if not external_resolvers_:
         resolv_dnsmasq_conf = read_file("/etc/resolv.dnsmasq.conf").split("\n")
         external_resolvers_ = [r.split(" ")[1] for r in resolv_dnsmasq_conf if r.startswith("nameserver")]
+        # We keep only ipv4 resolvers, otherwise on IPv4-only instances, IPv6
+        # will be tried anyway resulting in super-slow dig requests that'll wait
+        # until timeout...
+        external_resolvers_ = [r for r in external_resolvers_ if ":" not in r]
 
     return external_resolvers_