diff --git a/app/Services/InboundMail/InboundMail.php b/app/Services/InboundMail/InboundMail.php
index 2a897d2598b0..4532a041dedb 100644
--- a/app/Services/InboundMail/InboundMail.php
+++ b/app/Services/InboundMail/InboundMail.php
@@ -15,7 +15,7 @@ use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Carbon;
 
 /**
- * EmailObject.
+ * InboundMail.
  */
 class InboundMail
 {
diff --git a/app/Services/InboundMail/InboundMailEngine.php b/app/Services/InboundMail/InboundMailEngine.php
index c4b80ffebee5..c6934b50decc 100644
--- a/app/Services/InboundMail/InboundMailEngine.php
+++ b/app/Services/InboundMail/InboundMailEngine.php
@@ -38,9 +38,9 @@ class InboundMailEngine
     public function __construct()
     {
 
-        $this->globalBlacklist = explode(",", config('ninja.inbound_mailbox.global_inbound_blocklist'));
-        $this->globalWhitelist = explode(",", config('ninja.inbound_mailbox.global_inbound_whitelist')); // only for global validation, not for allowing to send something into the company, should be used to disabled blocking for mass-senders
-
+        // only for global validation, not for allowing to send something into the company, should be used to disabled blocking for mass-senders
+        $this->globalBlacklist = Ninja::isSelfHost() ? explode(",", config('ninja.inbound_mailbox.global_inbound_blocklist')) : [];
+        $this->globalWhitelist = Ninja::isSelfHost() ? explode(",", config('ninja.inbound_mailbox.global_inbound_whitelist')) : [];
     }
     /**
      * if there is not a company with an matching mailbox, we only do monitoring