diff --git a/modules/ppcp-wc-subscriptions/src/WcSubscriptionsModule.php b/modules/ppcp-wc-subscriptions/src/WcSubscriptionsModule.php
index 5abf985cc..1117e0f81 100644
--- a/modules/ppcp-wc-subscriptions/src/WcSubscriptionsModule.php
+++ b/modules/ppcp-wc-subscriptions/src/WcSubscriptionsModule.php
@@ -159,10 +159,7 @@ class WcSubscriptionsModule implements ModuleInterface {
 		add_filter(
 			'woocommerce_available_payment_gateways',
 			function( array $methods ) use ( $c ) : array {
-				if (
-					! is_wc_endpoint_url( 'order-pay' )
-					|| $c->has( 'save-payment-methods.eligible' ) && $c->get( 'save-payment-methods.eligible' )
-				) {
+				if ( ! is_wc_endpoint_url( 'order-pay' ) ) {
 					return $methods;
 				}
 
@@ -171,6 +168,10 @@ class WcSubscriptionsModule implements ModuleInterface {
 					unset( $methods[ PayPalGateway::ID ] );
 				}
 
+				if ( $c->has( 'save-payment-methods.eligible' ) && $c->get( 'save-payment-methods.eligible' ) ) {
+					return $methods;
+				}
+
 				$card_tokens = WC_Payment_Tokens::get_customer_tokens( get_current_user_id(), CreditCardGateway::ID );
 				if ( ! $card_tokens ) {
 					unset( $methods[ CreditCardGateway::ID ] );