diff --git a/woocommerce/payment-gateway/Blocks/Gateway_Checkout_Block_Integration.php b/woocommerce/payment-gateway/Blocks/Gateway_Checkout_Block_Integration.php
index 3e2179a48..9a1b315c6 100644
--- a/woocommerce/payment-gateway/Blocks/Gateway_Checkout_Block_Integration.php
+++ b/woocommerce/payment-gateway/Blocks/Gateway_Checkout_Block_Integration.php
@@ -563,8 +563,8 @@ public function prepare_payment_data( PaymentContext $payment_context, PaymentRe
 		 * Convert the tokenization flag to the expected key-value pair:
 		 * @see SV_WC_Payment_Gateway_Payment_Tokens_Handler::should_tokenize()
 		 */
-		if ( $should_tokenize = $payment_context->payment_data['wc-' . $this->gateway->get_id() . '-new-payment-method'] ) {
-			$additional_payment_data[ 'wc-' . $this->gateway->get_id_dasherized() . '-tokenize-payment-method' ] = $should_tokenize;
+		if ($should_tokenize = ($payment_context->payment_data['wc-' . $this->gateway->get_id() . '-new-payment-method'] ?? null)) {
+			$additional_payment_data['wc-' . $this->gateway->get_id_dasherized() . '-tokenize-payment-method'] = $should_tokenize;
 		}
 
 		/**
@@ -593,7 +593,7 @@ public function prepare_payment_data( PaymentContext $payment_context, PaymentRe
 	 */
 	protected function get_payment_token_for_context( PaymentContext $payment_context ): ?SV_WC_Payment_Gateway_Payment_Token {
 
-		$core_token_id = $payment_context->payment_data['token'] ?: null;
+		$core_token_id = $payment_context->payment_data['token'] ?? null;
 
 		if ( ! $core_token_id || $payment_context->payment_method !== $this->gateway->get_id() ) {
 			return null;