diff --git a/data/hooks/diagnosis/12-dnsrecords.py b/data/hooks/diagnosis/12-dnsrecords.py
index 941911147..cb8193dd5 100644
--- a/data/hooks/diagnosis/12-dnsrecords.py
+++ b/data/hooks/diagnosis/12-dnsrecords.py
@@ -130,8 +130,11 @@ class DNSRecordsDiagnoser(Diagnoser):
             # Split expected/current
             #  from  "v=DKIM1; k=rsa; p=hugekey;"
             #  to a set like {'v=DKIM1', 'k=rsa', 'p=...'}
+            # Additionally, for DKIM, because the key is pretty long,
+            # some DNS registrar sometime split it into several pieces like this:
+            # "p=foo" "bar" (with a space and quotes in the middle)...
             expected = set(r["value"].strip(';" ').replace(";", " ").split())
-            current = set(r["current"].strip(';" ').replace(";", " ").split())
+            current = set(r["current"].replace('" "', '').strip(';" ').replace(";", " ").split())
 
             # For SPF, ignore parts starting by ip4: or ip6:
             if r["name"] == "@":