diff --git a/modoboa/admin/management/commands/subcommands/_mx.py b/modoboa/admin/management/commands/subcommands/_mx.py
index b16e48729..935933f7f 100644
--- a/modoboa/admin/management/commands/subcommands/_mx.py
+++ b/modoboa/admin/management/commands/subcommands/_mx.py
@@ -80,7 +80,7 @@ class CheckMXRecords(BaseCommand):
         models.MXRecord.objects.filter(domain=domain).delete()
         try:
             answers = dns.resolver.query(domain.name, "MX")
-        except dns.resolver.NoAnswer:
+        except (dns.resolver.NoAnswer, dns.resolver.NXDOMAIN):
             raise StopIteration()
 
         delta = timedelta(seconds=ttl)