diff --git a/modules/ppcp-button/services.php b/modules/ppcp-button/services.php
index 07dd078b6..f145e6ece 100644
--- a/modules/ppcp-button/services.php
+++ b/modules/ppcp-button/services.php
@@ -60,7 +60,6 @@ return array(
 			return new DisabledSmartButton();
 		}
 		$payee_repository = $container->get( 'api.repository.payee' );
-		$identity_token   = $container->get( 'api.endpoint.identity-token' );
 		$payer_factory    = $container->get( 'api.factory.payer' );
 		$request_data     = $container->get( 'button.request-data' );
 
@@ -74,7 +73,6 @@ return array(
 			$container->get( 'session.handler' ),
 			$settings,
 			$payee_repository,
-			$identity_token,
 			$payer_factory,
 			$client_id,
 			$request_data,
diff --git a/modules/ppcp-button/src/Assets/class-smartbutton.php b/modules/ppcp-button/src/Assets/class-smartbutton.php
index 2b441c890..f72615620 100644
--- a/modules/ppcp-button/src/Assets/class-smartbutton.php
+++ b/modules/ppcp-button/src/Assets/class-smartbutton.php
@@ -9,7 +9,6 @@ declare(strict_types=1);
 
 namespace WooCommerce\PayPalCommerce\Button\Assets;
 
-use WooCommerce\PayPalCommerce\ApiClient\Endpoint\IdentityToken;
 use WooCommerce\PayPalCommerce\ApiClient\Factory\PayerFactory;
 use WooCommerce\PayPalCommerce\ApiClient\Helper\DccApplies;
 use WooCommerce\PayPalCommerce\ApiClient\Repository\PayeeRepository;
@@ -57,13 +56,6 @@ class SmartButton implements SmartButtonInterface {
 	 */
 	private $payee_repository;
 
-	/**
-	 * The Identity Token.
-	 *
-	 * @var IdentityToken
-	 */
-	private $identity_token;
-
 	/**
 	 * The Payer Factory.
 	 *
@@ -120,7 +112,6 @@ class SmartButton implements SmartButtonInterface {
 	 * @param SessionHandler     $session_handler The Session Handler.
 	 * @param Settings           $settings The Settings.
 	 * @param PayeeRepository    $payee_repository The Payee Repository.
-	 * @param IdentityToken      $identity_token The Identity Token.
 	 * @param PayerFactory       $payer_factory The Payer factory.
 	 * @param string             $client_id The client ID.
 	 * @param RequestData        $request_data The Request Data helper.
@@ -134,7 +125,6 @@ class SmartButton implements SmartButtonInterface {
 		SessionHandler $session_handler,
 		Settings $settings,
 		PayeeRepository $payee_repository,
-		IdentityToken $identity_token,
 		PayerFactory $payer_factory,
 		string $client_id,
 		RequestData $request_data,
@@ -148,7 +138,6 @@ class SmartButton implements SmartButtonInterface {
 		$this->session_handler     = $session_handler;
 		$this->settings            = $settings;
 		$this->payee_repository    = $payee_repository;
-		$this->identity_token      = $identity_token;
 		$this->payer_factory       = $payer_factory;
 		$this->client_id           = $client_id;
 		$this->request_data        = $request_data;
@@ -321,7 +310,7 @@ class SmartButton implements SmartButtonInterface {
 			);
 		}
 
-		add_action( 'woocommerce_review_order_after_submit', array( $this, 'button_renderer' ), 10 );
+		add_action( 'woocommerce_review_order_after_payment', array( $this, 'button_renderer' ), 10 );
 		add_action( 'woocommerce_pay_order_after_submit', array( $this, 'button_renderer' ), 10 );
 
 		return true;