diff --git a/modules/ppcp-wc-gateway/connection-tab-settings.php b/modules/ppcp-wc-gateway/connection-tab-settings.php
index 600bc70f4..bd2db4e71 100644
--- a/modules/ppcp-wc-gateway/connection-tab-settings.php
+++ b/modules/ppcp-wc-gateway/connection-tab-settings.php
@@ -357,7 +357,7 @@ return function ( ContainerInterface $container, array $fields ): array {
 			'screens'      => array(
 				State::STATE_ONBOARDED,
 			),
-			'requirements' => array( 'dcc' ),
+			'requirements' => array(),
 			'gateway'      => Settings::CONNECTION_TAB_ID,
 		),
 		'ppcp_pui_status'                               => array(
diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php
index 9f59b456a..dc75166b5 100644
--- a/modules/ppcp-wc-gateway/services.php
+++ b/modules/ppcp-wc-gateway/services.php
@@ -2144,13 +2144,13 @@ return array(
 		return 'https://www.paypal.com/bizsignup/entry?country.x=DE&product=payment_methods&capabilities=PAY_UPON_INVOICE';
 	},
 	'wcgateway.settings.connection.dcc-status-text'        => static function ( ContainerInterface $container ): string {
-        $dcc_product_status = $container->get( 'wcgateway.helper.dcc-product-status' );
-        assert( $dcc_product_status instanceof DCCProductStatus );
+		$dcc_applies = $container->get( 'api.helpers.dccapplies' );
+		assert( $dcc_applies instanceof DccApplies );
 
 		$environment = $container->get( 'onboarding.environment' );
 		assert( $environment instanceof Environment );
 
-		$dcc_enabled = $dcc_product_status->dcc_is_active();
+		$dcc_enabled = $dcc_applies->for_country_currency() || $dcc_applies->for_wc_payments();
 
 		$enabled_status_text  = esc_html__( 'Status: Enabled', 'woocommerce-paypal-payments' );
 		$disabled_status_text = esc_html__( 'Status: Not yet enabled', 'woocommerce-paypal-payments' );
@@ -2183,7 +2183,9 @@ return array(
 		$environment = $container->get( 'onboarding.environment' );
 		assert( $environment instanceof Environment );
 
-		$pui_enabled = $pui_product_status->pui_is_active();
+		$shop_country = $container->get( 'api.shop.country' );
+
+		$pui_enabled = 'DE' === $shop_country && $pui_product_status->pui_is_active();
 
 		$enabled_status_text  = esc_html__( 'Status: Enabled', 'woocommerce-paypal-payments' );
 		$disabled_status_text = esc_html__( 'Status: Not yet enabled', 'woocommerce-paypal-payments' );
diff --git a/modules/ppcp-wc-gateway/src/Settings/SettingsRenderer.php b/modules/ppcp-wc-gateway/src/Settings/SettingsRenderer.php
index 9f98742a4..4a57a83e6 100644
--- a/modules/ppcp-wc-gateway/src/Settings/SettingsRenderer.php
+++ b/modules/ppcp-wc-gateway/src/Settings/SettingsRenderer.php
@@ -390,6 +390,12 @@ $data_rows_html
 			) {
 				continue;
 			}
+			if (
+				in_array( 'dcc', $config['requirements'], true )
+				&& ! $this->dcc_product_status->dcc_is_active()
+			) {
+				continue;
+			}
 			if (
 				in_array( 'messages', $config['requirements'], true )
 				&& ! $this->messages_apply->for_country()