diff --git a/modules/ppcp-vaulting/src/PaymentTokenChecker.php b/modules/ppcp-vaulting/src/PaymentTokenChecker.php
index 2bad12114..cd57e9426 100644
--- a/modules/ppcp-vaulting/src/PaymentTokenChecker.php
+++ b/modules/ppcp-vaulting/src/PaymentTokenChecker.php
@@ -143,12 +143,13 @@ class PaymentTokenChecker {
 
 		try {
 			$subscription_behavior_when_fails = $this->settings->get( 'subscription_behavior_when_vault_fails' );
-			$wc_order->update_meta_data( self::VAULTING_FAILED_META_KEY, $subscription_behavior_when_fails );
-			$wc_order->save_meta_data();
 		} catch ( NotFoundException $exception ) {
-			return;
+			$subscription_behavior_when_fails = 'void_auth';
 		}
 
+		$wc_order->update_meta_data( self::VAULTING_FAILED_META_KEY, $subscription_behavior_when_fails );
+		$wc_order->save_meta_data();
+
 		switch ( $subscription_behavior_when_fails ) {
 			case 'void_auth':
 				$order = $this->order_repository->for_wc_order( $wc_order );