diff --git a/CHANGES.md b/CHANGES.md
index 9aadc06e46..b90dd2f1ea 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -40,6 +40,7 @@
 - Upgraded Traefik image to version 2.3
 - Upgraded Redis Docker image to version 6.0 (alpine)
 - Upgraded Influxdb Docker image to version 1.8 (alpine)
+- Added option to disable mail sending by setting empty SMTP host
 
 ## Breaking Changes (Read before upgrading!)
 - **Deprecated** `first` and `last` query params for documents list route in the database API
diff --git a/app/workers/mails.php b/app/workers/mails.php
index e80759cead..a7f6f6c235 100644
--- a/app/workers/mails.php
+++ b/app/workers/mails.php
@@ -1,6 +1,7 @@
 <?php
 
 use Utopia\App;
+use Utopia\CLI\Console;
 
 require_once __DIR__.'/../init.php';
 
@@ -23,6 +24,11 @@ class MailsV1
     {
         global $register;
 
+        if(empty(App::getEnv('_APP_SMTP_HOST'))) {
+            Console::info('Skipped mail processing. No SMTP server hostname has been set.');
+            return;
+        }
+
         $event = $this->args['event'];
         $from = $this->args['from'];
         $recipient = $this->args['recipient'];
diff --git a/docs/tutorials/environment-variables.md b/docs/tutorials/environment-variables.md
index 7de4c95e49..3ab2183ff2 100644
--- a/docs/tutorials/environment-variables.md
+++ b/docs/tutorials/environment-variables.md
@@ -112,7 +112,7 @@ If running in production, it might be easier to use a 3rd party SMTP server as i
 
 ### _APP_SMTP_HOST
 
-SMTP server host name address. Default value is: 'smtp'
+SMTP server host name address. Default value is: 'smtp'. Pass an empty string to disable all mail sending from the server.
 
 ### _APP_SMTP_PORT