diff --git a/src/Components/Checkout/SalesChannel/HandlePaymentMethodRoute.php b/src/Components/Checkout/SalesChannel/HandlePaymentMethodRoute.php
index aedd2124..eba2f1c3 100644
--- a/src/Components/Checkout/SalesChannel/HandlePaymentMethodRoute.php
+++ b/src/Components/Checkout/SalesChannel/HandlePaymentMethodRoute.php
@@ -45,9 +45,9 @@ public function load(Request $request, SalesChannelContext $context): HandlePaym
         }
 
         $paymentHandlerIdentifier = null;
-        if ($request->request->getBoolean('updatePayment')) {
-            $orderId = $request->request->get('orderId');
+        $orderId = $request->request->get('orderId');
 
+        if (is_string($orderId)) {
             $order = $this->orderRepository->search(CriteriaHelper::getCriteriaForOrder($orderId), $context->getContext())->first();
             if ($order instanceof OrderEntity && ($transaction = $order->getTransactions()->last()) instanceof OrderTransactionEntity) {
                 $paymentHandlerIdentifier = $transaction->getPaymentMethod()->getHandlerIdentifier();