diff --git a/CHANGES b/CHANGES
index 7e221d8b7..a5af29d6c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1522,3 +1522,6 @@
 * Add user pagination UI
 * Add namecheap as supported DNS provider
 
+[3.6.0]
+* Send notifications from dashboard domain
+
diff --git a/src/mailer.js b/src/mailer.js
index 93fbb932e..f25aa0af1 100644
--- a/src/mailer.js
+++ b/src/mailer.js
@@ -86,18 +86,10 @@ function getMailConfig(callback) {
                 cloudronName = 'Cloudron';
             }
 
-            mail.getDomains(function (error, domains) {
-                if (error) return callback(error);
-                if (domains.length === 0) return callback('No domains configured');
-
-                const defaultDomain = domains[0];
-
-                callback(null, {
-                    adminEmails: adminEmails,
-                    cloudronName: cloudronName,
-                    notificationDomain: defaultDomain.domain,
-                    notificationFrom: `"${cloudronName}" <no-reply@${defaultDomain.domain}>`
-                });
+            callback(null, {
+                adminEmails: adminEmails,
+                cloudronName: cloudronName,
+                notificationFrom: `"${cloudronName}" <no-reply@${config.adminDomain()}>`
             });
         });
     });