ShopPay not redirecting to my custom domain after payment

[papercollective]

I'm seeing an issue where the Shop Pay module is not redirecting to my custom domain, after a transaction has been completed.

Here's my flow:

1 ) Headless website (using Storefront API)
Located at:

customdomain.com

2 ) Custom domain for Shopify checkout
Located at:

checkout.customdomain.com/:id/orders/:orderId

3 ) Payment through ShopPay
Located at:

shop.app/pay/transactions/new/token/:token?locale=da&redirect_source=checkout_automatic_redirect

4 ) Order confirmation (this should redirect back to checkout.customdomain.com)
Redirected to:

store-name.myshopify.com/:id/orders/:orderId

Are you aware of this issue or is there any way to fix this through my settings in Shopify?

[ChrisHarris]

I've had the same issue and can effect attribution. Would be great if the redirect respected the custom domain url.