diff --git a/models/settings.js b/models/settings.js
index 783629f5a..7d0eba5d8 100644
--- a/models/settings.js
+++ b/models/settings.js
@@ -159,6 +159,7 @@ if (Meteor.isServer) {
       };
       Settings.insert(defaultSetting);
     }
+    /*
     if (isSandstorm) {
       // At Sandstorm, Admin Panel has SMTP settings
       const newSetting = Settings.findOne();
@@ -171,7 +172,9 @@ if (Meteor.isServer) {
       // Not running on Sandstorm, so using environment variables
       Accounts.emailTemplates.from = process.env.MAIL_FROM;
     }
+    */
   });
+  /*
   if (isSandstorm) {
     // At Sandstorm Wekan Admin Panel, save SMTP settings.
     Settings.after.update((userId, doc, fieldNames) => {
@@ -191,6 +194,7 @@ if (Meteor.isServer) {
       }
     });
   }
+  */
 
   function getRandomNum(min, max) {
     const range = max - min;
@@ -237,7 +241,7 @@ if (Meteor.isServer) {
           subject: TAPi18n.__('email-invite-register-subject', params, lang),
           text: TAPi18n.__('email-invite-register-text', params, lang),
         })
-      } else {
+      } else if (process.env.MAIL_URL !== '') {
         Email.send({
           to: icode.email,
           from: Accounts.emailTemplates.from,
@@ -351,7 +355,7 @@ if (Meteor.isServer) {
             subject: TAPi18n.__('email-smtp-test-subject', { lng: lang }),
             text: TAPi18n.__('email-smtp-test-text', { lng: lang }),
           })
-        } else {
+        } else if (process.env.MAIL_URL !== '') {
           Email.send({
             to: user.emails[0].address,
             from: Accounts.emailTemplates.from,
diff --git a/models/users.js b/models/users.js
index 6796f7251..aa426cad1 100644
--- a/models/users.js
+++ b/models/users.js
@@ -1234,7 +1234,7 @@ if (Meteor.isServer) {
             subject: TAPi18n.__('email-invite-subject', params, lang),
             text: TAPi18n.__('email-invite-text', params, lang),
           })
-        } else {
+        } else if (process.env.MAIL_URL !== '') {
           Email.send({
             to: user.emails[0].address.toLowerCase(),
             from: Accounts.emailTemplates.from,
diff --git a/server/notifications/email.js b/server/notifications/email.js
index 30466aba2..f930ed11c 100644
--- a/server/notifications/email.js
+++ b/server/notifications/email.js
@@ -54,7 +54,7 @@ Meteor.startup(() => {
             subject,
             html,
           })
-        } else {
+        } else if (process.env.MAIL_URL !== '') {
           Email.send({
             to: user.emails[0].address.toLowerCase(),
             from: Accounts.emailTemplates.from,
diff --git a/server/rulesHelper.js b/server/rulesHelper.js
index e6a1dbf70..c8d9f1a11 100644
--- a/server/rulesHelper.js
+++ b/server/rulesHelper.js
@@ -135,7 +135,7 @@ RulesHelper = {
             subject,
             text,
           })
-        } else {
+        } else if (process.env.MAIL_URL !== '') {
           Email.send({
             to,
             from: Accounts.emailTemplates.from,