diff --git a/modules/ppcp-googlepay/resources/js/Context/CheckoutHandler.js b/modules/ppcp-googlepay/resources/js/Context/CheckoutHandler.js
index 251b4f3c4..82d04f578 100644
--- a/modules/ppcp-googlepay/resources/js/Context/CheckoutHandler.js
+++ b/modules/ppcp-googlepay/resources/js/Context/CheckoutHandler.js
@@ -4,7 +4,7 @@ import CheckoutActionHandler from '../../../../ppcp-button/resources/js/modules/
 import FormValidator from '../../../../ppcp-button/resources/js/modules/Helper/FormValidator';
 
 class CheckoutHandler extends BaseHandler {
-	transactionInfo() {
+	formValidator() {
 		return new Promise( async ( resolve, reject ) => {
 			try {
 				const spinner = new Spinner();
@@ -23,7 +23,7 @@ class CheckoutHandler extends BaseHandler {
 					: null;
 
 				if ( ! formValidator ) {
-					resolve( super.transactionInfo() );
+					resolve();
 					return;
 				}
 
@@ -42,7 +42,7 @@ class CheckoutHandler extends BaseHandler {
 
 							reject();
 						} else {
-							resolve( super.transactionInfo() );
+							resolve();
 						}
 					} );
 			} catch ( error ) {
diff --git a/modules/ppcp-googlepay/resources/js/GooglepayButton.js b/modules/ppcp-googlepay/resources/js/GooglepayButton.js
index 87bc642f0..2c15571b3 100644
--- a/modules/ppcp-googlepay/resources/js/GooglepayButton.js
+++ b/modules/ppcp-googlepay/resources/js/GooglepayButton.js
@@ -292,17 +292,24 @@ class GooglepayButton {
 	onButtonClick() {
 		this.log( 'onButtonClick', this.context );
 
-		const paymentDataRequest = this.paymentDataRequest();
+		this.contextHandler.formValidator().then(
+			() => {
+				window.ppcpFundingSource = 'googlepay';
 
-		this.log(
-			'onButtonClick: paymentDataRequest',
-			paymentDataRequest,
-			this.context
+				const paymentDataRequest = this.paymentDataRequest();
+
+				this.log(
+					'onButtonClick: paymentDataRequest',
+					paymentDataRequest,
+					this.context
+				);
+
+				this.paymentsClient.loadPaymentData( paymentDataRequest );
+			},
+			() => {
+				console.error( '[GooglePayButton] Form validation failed.' );
+			}
 		);
-
-		window.ppcpFundingSource = 'googlepay'; // Do this on another place like on create order endpoint handler.
-
-		this.paymentsClient.loadPaymentData( paymentDataRequest );
 	}
 
 	paymentDataRequest() {