diff --git a/app/Http/Controllers/CompanyGatewayController.php b/app/Http/Controllers/CompanyGatewayController.php
index 9c0a4f4eff4a..7af1c173bf5e 100644
--- a/app/Http/Controllers/CompanyGatewayController.php
+++ b/app/Http/Controllers/CompanyGatewayController.php
@@ -385,7 +385,7 @@ class CompanyGatewayController extends BaseController
 
         $company_gateway->save();
 
-        ApplePayDomain::dispatch($company_gateway, $company_gateway->company->db);
+        // ApplePayDomain::dispatch($company_gateway, $company_gateway->company->db);
 
         return $this->itemResponse($company_gateway);
     }
diff --git a/app/Http/Requests/CompanyGateway/UpdateCompanyGatewayRequest.php b/app/Http/Requests/CompanyGateway/UpdateCompanyGatewayRequest.php
index 09c6e8535449..4297d50800aa 100644
--- a/app/Http/Requests/CompanyGateway/UpdateCompanyGatewayRequest.php
+++ b/app/Http/Requests/CompanyGateway/UpdateCompanyGatewayRequest.php
@@ -61,6 +61,9 @@ class UpdateCompanyGatewayRequest extends Request
             $input['fees_and_limits'] = $this->cleanFeesAndLimits($input['fees_and_limits']);
         }
 
+        if (isset($input['token_billing']) && $input['token_billing'] == 'disabled') 
+            $input['token_billing'] = 'off';
+
         $this->replace($input);
     }
 }
diff --git a/resources/views/portal/ninja2020/gateways/includes/save_card.blade.php b/resources/views/portal/ninja2020/gateways/includes/save_card.blade.php
index 34a5b3671075..f56bc8af5224 100644
--- a/resources/views/portal/ninja2020/gateways/includes/save_card.blade.php
+++ b/resources/views/portal/ninja2020/gateways/includes/save_card.blade.php
@@ -1,7 +1,22 @@
 @php
-    $token_billing = $gateway instanceof \App\Models\CompanyGateway
-            ? $gateway->token_billing !== 'always'
-            : $gateway->company_gateway->token_billing !== 'always';
+    // $token_billing = $gateway instanceof \App\Models\CompanyGateway
+    //         ? $gateway->token_billing !== 'always'
+    //         : $gateway->company_gateway->token_billing !== 'always';
+
+    $gateway_instance = $gateway instanceof \App\Models\CompanyGateway ? $gateway : $gateway->company_gateway;
+    $token_billing = true;
+    $checked_on = '';
+    $checked_off = 'checked';
+
+    if($gateway_instance->token_billing == 'off' || $gateway_instance->token_billing == 'always'){
+        $token_billing = false;
+    }
+    
+    if($gateway_instance->token_billing == 'optout' || $gateway_instance->token_billing == 'always'){
+        $checked_on = 'checked';
+        $checked_off = '';
+    }
+    
 @endphp
 
 @if($token_billing)
@@ -13,13 +28,13 @@
             <label class="mr-4">
                 <input type="radio" class="form-radio cursor-pointer" name="token-billing-checkbox"
                        id="proxy_is_default"
-                       value="true"/>
+                       value="true" {{ $checked_on }}/>
                 <span class="ml-1 cursor-pointer">{{ ctrans('texts.yes') }}</span>
             </label>
             <label>
                 <input type="radio" class="form-radio cursor-pointer" name="token-billing-checkbox"
                        id="proxy_is_default"
-                       value="false" checked />
+                       value="false" {{ $checked_off }} />
                 <span class="ml-1 cursor-pointer">{{ ctrans('texts.no') }}</span>
             </label>
         </dd>