diff --git a/src/Core/Config.php b/src/Core/Config.php
index 9d9b845d..f7af5d41 100644
--- a/src/Core/Config.php
+++ b/src/Core/Config.php
@@ -109,11 +109,6 @@ public function isPuiEligibility(): bool
         return $this->getServiceFromContainer(ModuleSettings::class)->isPuiEligibility();
     }
 
-    public function isVaultingEligibility(): bool
-    {
-        return $this->getServiceFromContainer(ModuleSettings::class)->isVaultingEligibility();
-    }
-
     public function isLiveVaultingEligibility(): bool
     {
         return $this->getServiceFromContainer(ModuleSettings::class)->isLiveVaultingEligibility();
diff --git a/src/Service/ModuleSettings.php b/src/Service/ModuleSettings.php
index 6ef50f91..790b73c6 100644
--- a/src/Service/ModuleSettings.php
+++ b/src/Service/ModuleSettings.php
@@ -156,14 +156,7 @@ public function isPuiEligibility(): bool
         return $this->isSandbox() ?
             $this->isSandboxPuiEligibility() :
             $this->isLivePuiEligibility();
-    }
 
-    public function isVaultingEligibility(): bool
-    {
-        return $this->isSandbox() ?
-            $this->isSandBoxVaultingEligibility() :
-            $this->isLiveVaultingEligibility();
-    }
 
     public function getLiveClientId(): string
     {
@@ -577,11 +570,6 @@ public function alwaysIgnoreSCAResult(): bool
         return $value === Constants::PAYPAL_SCA_DISABLED;
     }
 
-    public function getIsVaultingActive(): bool
-    {
-        return (bool)$this->getSettingValue('oscPayPalSetVaulting');
-    }
-
     /**
      * @return mixed
      */
diff --git a/views/smarty/admin/oscpaypalconfig.tpl b/views/smarty/admin/oscpaypalconfig.tpl
index 6c65b685..65ec2672 100644
--- a/views/smarty/admin/oscpaypalconfig.tpl
+++ b/views/smarty/admin/oscpaypalconfig.tpl
@@ -504,7 +504,11 @@
                             <div class="controls">
                                 <div class="checkbox">
                                     <label>
-                                        <input type="checkbox" name="conf[oscPayPalSetVaulting]" [{if $config->getIsVaultingActive()}]checked[{/if}] value="1">
+                                        [{if $isSandBox}]
+                                            <input type="checkbox" name="conf[oscPayPalSetVaulting]" [{if $config->getIsVaultingActive()}]checked[{/if}] value="1" [{if !$config->isSandboxVaultingEligibility()}]disabled[{/if}]>
+                                        [{else}]
+                                            <input type="checkbox" name="conf[oscPayPalSetVaulting]" [{if $config->getIsVaultingActive()}]checked[{/if}] value="1" [{if !$config->isLiveVaultingEligibility()}]disabled[{/if}]>
+                                        [{/if}]
                                         [{oxmultilang ident="OSC_PAYPAL_VAULTING_ACTIVATE_VAULTING"}]
                                     </label>
                                 </div>
diff --git a/views/twig/admin/oscpaypalconfig.html.twig b/views/twig/admin/oscpaypalconfig.html.twig
index 4855a1d1..2914c553 100644
--- a/views/twig/admin/oscpaypalconfig.html.twig
+++ b/views/twig/admin/oscpaypalconfig.html.twig
@@ -156,11 +156,11 @@
                         <div class="form-group sandbox">
                             <label for="special-payments-sandbox">{{ translate({ ident: "OSC_PAYPAL_SPECIAL_PAYMENTS", suffix:"COLON" }) }}</label>
                             <div>
-                                {{ translate({ ident: "OSC_PAYPAL_SPECIAL_PAYMENTS_PUI", suffix:"COLON" }) }} {% if config.isLivePuiEligibility() %}{{ translate({ ident: "GENERAL_YES" }) }}{% else %}{{ translate({ ident: "GENERAL_NO" }) }}{% endif %}<br />
+                                {{ translate({ ident: "OSC_PAYPAL_SPECIAL_PAYMENTS_PUI", suffix:"COLON" }) }} {% if config.isSandboxPuiEligibility() %}{{ translate({ ident: "GENERAL_YES" }) }}{% else %}{{ translate({ ident: "GENERAL_NO" }) }}{% endif %}<br />
                                 <br>
-                                {{ translate({ ident: "OSC_PAYPAL_SPECIAL_PAYMENTS_ACDC", suffix:"COLON" }) }} {% if config.isLiveAcdcEligibility() %}{{ translate({ ident: "GENERAL_YES" }) }}{% else %}{{ translate({ ident: "GENERAL_NO" }) }} {{ translate({ ident: "OSC_PAYPAL_SPECIAL_PAYMENTS_ACDC_FALLBACK" }) }}{% endif %}
+                                {{ translate({ ident: "OSC_PAYPAL_SPECIAL_PAYMENTS_ACDC", suffix:"COLON" }) }} {% if config.isSandboxAcdcEligibility() %}{{ translate({ ident: "GENERAL_YES" }) }}{% else %}{{ translate({ ident: "GENERAL_NO" }) }} {{ translate({ ident: "OSC_PAYPAL_SPECIAL_PAYMENTS_ACDC_FALLBACK" }) }}{% endif %}
                                 <br>
-                                {{ translate({ ident: "OSC_PAYPAL_SPECIAL_PAYMENTS_VAULTING", suffix:"COLON" }) }} {% if config.isVaultingEligibility() %}{{ translate({ ident: "GENERAL_YES" }) }}{% else %}{{ translate({ ident: "GENERAL_NO" }) }} {% endif %}
+                                {{ translate({ ident: "OSC_PAYPAL_SPECIAL_PAYMENTS_VAULTING", suffix:"COLON" }) }} {% if config.isSandboxVaultingEligibility() %}{{ translate({ ident: "GENERAL_YES" }) }}{% else %}{{ translate({ ident: "GENERAL_NO" }) }} {% endif %}
                             </div>
                         </div>
 
@@ -521,7 +521,6 @@
                         {{ translate({ ident: "OSC_PAYPAL_VAULTING_TITLE" }) }}
                     </h4>
                 </div>
-
                 <div id="collapse10" class="collapse" aria-labelledby="heading10" data-parent="#accordion">
                     <div class="card-body">
                         <div class="form-group">
@@ -531,7 +530,7 @@
                                         <div class="checkbox">
                                             <label>
                                                 {% if config.isSandbox() %}selected
-                                                    <input type="checkbox" name="conf[oscPayPalSetVaulting]" {% if config.getIsVaultingActive() %}checked{% endif %} value="1" {% if config.isVaultingEligibility() == false %}disabled{% endif %}>
+                                                    <input type="checkbox" name="conf[oscPayPalSetVaulting]" {% if config.getIsVaultingActive() %}checked{% endif %} value="1" {% if config.isSandboxVaultingEligibility() == false %}disabled{% endif %}>
                                                 {% else %}
                                                     <input type="checkbox" name="conf[oscPayPalSetVaulting]" {% if config.getIsVaultingActive() %}checked{% endif %} value="1" {% if config.isLiveVaultingEligibility() == false %}disabled{% endif %}>
                                                 {% endif %}