diff --git a/modules/ppcp-button/src/Endpoint/CreateOrderEndpoint.php b/modules/ppcp-button/src/Endpoint/CreateOrderEndpoint.php
index b9a59c490..3e6e5cb9d 100644
--- a/modules/ppcp-button/src/Endpoint/CreateOrderEndpoint.php
+++ b/modules/ppcp-button/src/Endpoint/CreateOrderEndpoint.php
@@ -233,14 +233,18 @@ class CreateOrderEndpoint implements EndpointInterface {
 
 			$this->set_bn_code( $data );
 
-			if ( 'checkout' === $data['context'] ) {
-				try {
-					$order = $this->create_paypal_order( $wc_order );
-				} catch ( Exception $exception ) {
-					$this->logger->error( 'Order creation failed: ' . $exception->getMessage() );
-					throw $exception;
-				}
+			if ( 'pay-now' === $data['context'] && get_option( 'woocommerce_terms_page_id', '' ) !== '' ) {
+				$this->validate_paynow_form( $data['form'] );
+			}
 
+			try {
+				$order = $this->create_paypal_order( $wc_order );
+			} catch ( Exception $exception ) {
+				$this->logger->error( 'Order creation failed: ' . $exception->getMessage() );
+				throw $exception;
+			}
+
+			if ( 'checkout' === $data['context'] ) {
 				if (
 					! $this->early_order_handler->should_create_early_order()
 					|| $this->registration_needed
@@ -251,12 +255,6 @@ class CreateOrderEndpoint implements EndpointInterface {
 				$this->early_order_handler->register_for_order( $order );
 			}
 
-			if ( 'pay-now' === $data['context'] && get_option( 'woocommerce_terms_page_id', '' ) !== '' ) {
-				$this->validate_paynow_form( $data['form'] );
-			}
-
-			$order = $this->create_paypal_order( $wc_order );
-
 			if ( 'pay-now' === $data['context'] && is_a( $wc_order, \WC_Order::class ) ) {
 				$wc_order->update_meta_data( PayPalGateway::ORDER_ID_META_KEY, $order->id() );
 				$wc_order->update_meta_data( PayPalGateway::INTENT_META_KEY, $order->intent() );
diff --git a/modules/ppcp-wc-gateway/src/Checkout/DisableGateways.php b/modules/ppcp-wc-gateway/src/Checkout/DisableGateways.php
index 8ecfce40c..ee3492209 100644
--- a/modules/ppcp-wc-gateway/src/Checkout/DisableGateways.php
+++ b/modules/ppcp-wc-gateway/src/Checkout/DisableGateways.php
@@ -88,9 +88,12 @@ class DisableGateways {
 	 * @return bool
 	 */
 	private function disable_all_gateways() : bool {
-		if ( ! $this->settings->has( 'enabled' ) || ! $this->settings->get( 'enabled' ) ) {
-			return true;
+		foreach ( WC()->payment_gateways->payment_gateways() as $gateway ) {
+			if ( PayPalGateway::ID === $gateway->id && $gateway->enabled !== 'yes' ) {
+				return true;
+			}
 		}
+
 		if ( ! $this->settings->has( 'merchant_email' ) || ! is_email( $this->settings->get( 'merchant_email' ) ) ) {
 			return true;
 		}