diff --git a/src/routes/settings.js b/src/routes/settings.js
index d767a14b1..86887da02 100644
--- a/src/routes/settings.js
+++ b/src/routes/settings.js
@@ -151,6 +151,9 @@ function getCloudronAvatar(req, res, next) {
 }
 
 function getEmailDnsRecords(req, res, next) {
+
+    req.clearTimeout();
+
     settings.getEmailDnsRecords(function (error, records) {
         if (error) return next(new HttpError(500, error));
 
diff --git a/src/settings.js b/src/settings.js
index 1a2943778..31f797a3c 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -267,7 +267,7 @@ function getEmailDnsRecords(callback) {
         });
     }
 
-    dns.platform.timeout = 8000;
+    dns.platform.timeout = 5000; // hack so that each query finish in 5 seconds
 
     async.series([
         checkMx,