diff --git a/modules/ppcp-button/resources/js/modules/ContextBootstrap/SingleProductBootstrap.js b/modules/ppcp-button/resources/js/modules/ContextBootstrap/SingleProductBootstrap.js
index ef51b32d5..e5ce5a231 100644
--- a/modules/ppcp-button/resources/js/modules/ContextBootstrap/SingleProductBootstrap.js
+++ b/modules/ppcp-button/resources/js/modules/ContextBootstrap/SingleProductBootstrap.js
@@ -243,15 +243,6 @@ class SingleProductBootstrap {
 			this.form(),
 			this.errorHandler
 		);
-		if (
-			! this.gateway.vaultingEnabled &&
-			[ 'subscription', 'variable-subscription' ].includes(
-				this.gateway.productType
-			) &&
-			this.gateway.manualRenewalEnabled !== '1'
-		) {
-			return;
-		}
 
 		if (
 			PayPalCommerceGateway.data_client_id.has_subscriptions &&
@@ -288,6 +279,16 @@ class SingleProductBootstrap {
 			return;
 		}
 
+		if (
+			! this.gateway.vaultingEnabled &&
+			[ 'subscription', 'variable-subscription' ].includes(
+				this.gateway.productType
+			) &&
+			this.gateway.manualRenewalEnabled !== '1'
+		) {
+			return;
+		}
+
 		this.renderer.render( actionHandler.configuration() );
 	}