diff --git a/modules/ppcp-wc-gateway/src/Endpoint/ReturnUrlEndpoint.php b/modules/ppcp-wc-gateway/src/Endpoint/ReturnUrlEndpoint.php
index 39b69ba5d..b53bc5c5d 100644
--- a/modules/ppcp-wc-gateway/src/Endpoint/ReturnUrlEndpoint.php
+++ b/modules/ppcp-wc-gateway/src/Endpoint/ReturnUrlEndpoint.php
@@ -109,6 +109,13 @@ class ReturnUrlEndpoint {
 			}
 		}
 
+		// Replace session order for approved/completed orders.
+		if ( $order->status()->is( OrderStatus::APPROVED )
+			|| $order->status()->is( OrderStatus::COMPLETED )
+		) {
+			$this->session_handler->replace_order( $order );
+		}
+
 		$wc_order_id = (int) $order->purchase_units()[0]->custom_id();
 		if ( ! $wc_order_id ) {
 			// We cannot finish processing here without WC order, but at least go into the continuation mode.