diff --git a/modules/ppcp-button/src/Assets/SmartButton.php b/modules/ppcp-button/src/Assets/SmartButton.php
index 9984f5c01..67d3990c1 100644
--- a/modules/ppcp-button/src/Assets/SmartButton.php
+++ b/modules/ppcp-button/src/Assets/SmartButton.php
@@ -962,7 +962,7 @@ class SmartButton implements SmartButtonInterface {
 		}
 
 		$enable_funding = array( 'venmo' );
-		if ( $this->settings_status->is_pay_later_messaging_enabled() || ! in_array( 'credit', $disable_funding, true ) ) {
+		if ( $this->settings_status->is_pay_later_messaging_enabled_for_location( $this->context() ) || ! in_array( 'credit', $disable_funding, true ) ) {
 			$enable_funding[] = 'paylater';
 		}
 
diff --git a/modules/ppcp-wc-gateway/resources/js/gateway-settings.js b/modules/ppcp-wc-gateway/resources/js/gateway-settings.js
index da9d10dc9..5cdb62f69 100644
--- a/modules/ppcp-wc-gateway/resources/js/gateway-settings.js
+++ b/modules/ppcp-wc-gateway/resources/js/gateway-settings.js
@@ -68,7 +68,7 @@ import MessageRenderer from "../../../ppcp-button/resources/js/modules/Renderer/
                 'currency': PayPalCommerceGatewaySettings.currency,
                 'integration-date': PayPalCommerceGatewaySettings.integration_date,
                 'components': ['buttons', 'funding-eligibility', 'messages'],
-                'enable-funding': ['venmo'],
+                'enable-funding': ['venmo', 'paylater'],
                 'buyer-country': PayPalCommerceGatewaySettings.country,
             };
             if (disabledSources?.length) {