diff --git a/app/Http/Controllers/CompanyGatewayController.php b/app/Http/Controllers/CompanyGatewayController.php
index 4f254dff9562..9c0a4f4eff4a 100644
--- a/app/Http/Controllers/CompanyGatewayController.php
+++ b/app/Http/Controllers/CompanyGatewayController.php
@@ -210,6 +210,8 @@ class CompanyGatewayController extends BaseController
             $company_gateway->save();
         }
 
+        ApplePayDomain::dispatch($company_gateway, $company_gateway->company->db);
+
         return $this->itemResponse($company_gateway);
     }
 
diff --git a/app/Jobs/Util/ApplePayDomain.php b/app/Jobs/Util/ApplePayDomain.php
index add6041ba478..8dc6230b557f 100644
--- a/app/Jobs/Util/ApplePayDomain.php
+++ b/app/Jobs/Util/ApplePayDomain.php
@@ -51,6 +51,7 @@ class ApplePayDomain implements ShouldQueue
      */
     public function handle()
     {
+        
         MultiDB::setDB($this->db);
 
         if(in_array($this->company_gateway->gateway_key, $this->stripe_keys))
diff --git a/app/Services/Invoice/InvoiceService.php b/app/Services/Invoice/InvoiceService.php
index f551b8d1972a..23c50125c89d 100644
--- a/app/Services/Invoice/InvoiceService.php
+++ b/app/Services/Invoice/InvoiceService.php
@@ -333,9 +333,10 @@ class InvoiceService
 
         try{
 
-            Storage::disk(config('filesystems.default'))->delete($this->invoice->client->invoice_filepath($invitation) . $this->invoice->numberFormatter().'.pdf');
+            if(Storage::disk(config('filesystems.default'))->exists($this->invoice->client->invoice_filepath($invitation) . $this->invoice->numberFormatter().'.pdf'))
+                Storage::disk(config('filesystems.default'))->delete($this->invoice->client->invoice_filepath($invitation) . $this->invoice->numberFormatter().'.pdf');
             
-            if(Ninja::isHosted()) {
+            if(Ninja::isHosted() && Storage::disk(config('filesystems.default'))->exists($this->invoice->client->invoice_filepath($invitation) . $this->invoice->numberFormatter().'.pdf')) {
                 Storage::disk('public')->delete($this->invoice->client->invoice_filepath($invitation) . $this->invoice->numberFormatter().'.pdf');
             }