diff --git a/modules/ppcp-api-client/src/Endpoint/class-orderendpoint.php b/modules/ppcp-api-client/src/Endpoint/class-orderendpoint.php
index 722ce5afc..fc66833c2 100644
--- a/modules/ppcp-api-client/src/Endpoint/class-orderendpoint.php
+++ b/modules/ppcp-api-client/src/Endpoint/class-orderendpoint.php
@@ -223,7 +223,7 @@ class OrderEndpoint {
 			'body'    => wp_json_encode( $data ),
 		);
 
-		$paypal_request_id                    = $paypal_request_id ? $paypal_request_id : uniqid( 'ppcp-', true );
+		$paypal_request_id                    = $paypal_request_id ?: $this->generate_request_id();
 		$args['headers']['PayPal-Request-Id'] = $paypal_request_id;
 		if ( $this->bn_code ) {
 			$args['headers']['PayPal-Partner-Attribution-Id'] = $this->bn_code;
@@ -547,4 +547,14 @@ class OrderEndpoint {
 		$new_order = $this->order( $order_to_update->id() );
 		return $new_order;
 	}
+	
+	/**
+	 * Generate a new invoice id.
+	 *
+	 * @return string
+	 */
+	private function generate_request_id(): string
+	{
+		return uniqid( 'ppcp-', true );
+	}
 }