diff --git a/changelog/as-disable-ece-non-shipping-products-tax-billing-address b/changelog/as-disable-ece-non-shipping-products-tax-billing-address
new file mode 100644
index 00000000000..08c8b9b7cd3
--- /dev/null
+++ b/changelog/as-disable-ece-non-shipping-products-tax-billing-address
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Disable ECE for non shipping products if Tax is calculated on billing address
diff --git a/includes/fraud-prevention/class-fraud-prevention-service.php b/includes/fraud-prevention/class-fraud-prevention-service.php
index b99eff77c33..2a23966efa2 100644
--- a/includes/fraud-prevention/class-fraud-prevention-service.php
+++ b/includes/fraud-prevention/class-fraud-prevention-service.php
@@ -87,7 +87,7 @@ public static function maybe_append_fraud_prevention_token() {
 			return;
 		}
 
-		// Don't add the token if the user isn't on the cart, checkout or product page.
+		// Don't add the token if the user isn't on the cart, checkout, product or pay for order page.
 		// Checking the product and cart page too because the user can pay quickly via the payment buttons on that page.
 		if ( ! is_checkout() && ! is_cart() && ! is_product() && ! $instance->is_pay_for_order_page() ) {
 			return;