diff --git a/app/Jobs/Brevo/ProcessBrevoWebhook.php b/app/Jobs/Brevo/ProcessBrevoWebhook.php
index 17c2929e6b5f..122d030e7454 100644
--- a/app/Jobs/Brevo/ProcessBrevoWebhook.php
+++ b/app/Jobs/Brevo/ProcessBrevoWebhook.php
@@ -421,7 +421,7 @@ class ProcessBrevoWebhook implements ShouldQueue
     public function getRawMessage(string $message_id)
     {
 
-        $brevo_secret = $this->company->settings->brevo_secret ?? config('services.brevo.key');
+        $brevo_secret = isset($this->company->settings->brevo_secret) && trim($this->company->settings->brevo_secret) != '' ? $this->company->settings->brevo_secret : config('services.brevo.key');
 
         $brevo = new TransactionalEmailsApi(null, Configuration::getDefaultConfiguration()->setApiKey('api-key', $brevo_secret));
         $messageDetail = $brevo->getTransacEmailContent($message_id);
diff --git a/app/Jobs/PostMark/ProcessPostmarkWebhook.php b/app/Jobs/PostMark/ProcessPostmarkWebhook.php
index 4d571999985b..0b3a040c009e 100644
--- a/app/Jobs/PostMark/ProcessPostmarkWebhook.php
+++ b/app/Jobs/PostMark/ProcessPostmarkWebhook.php
@@ -355,7 +355,9 @@ class ProcessPostmarkWebhook implements ShouldQueue
     public function getRawMessage(string $message_id)
     {
 
-        $postmark = new PostmarkClient(config('services.postmark.token'));
+        $postmark_secret = isset($this->company->settings->postmark_secret) && trim($this->company->settings->postmark_secret) != '' ? $this->company->settings->postmark_secret : config('services.postmark.token');
+
+        $postmark = new PostmarkClient($postmark_secret);
         $messageDetail = $postmark->getOutboundMessageDetails($message_id);
         return $messageDetail;
 
@@ -386,7 +388,7 @@ class ProcessPostmarkWebhook implements ShouldQueue
 
         try {
 
-            $postmark_secret = $this->company->settings->postmark_secret ?? config('services.postmark.token');
+            $postmark_secret = isset($this->company->settings->postmark_secret) && trim($this->company->settings->postmark_secret) != '' ? $this->company->settings->postmark_secret : config('services.postmark.token');
 
             $postmark = new PostmarkClient($postmark_secret);
             $messageDetail = $postmark->getOutboundMessageDetails($this->request['MessageID']);