Hi @dannyelo ,
Seems that we have a similar problem. I have posted a workaround while we’re waiting for them to fix this. I have reached out to the Shopify Partner regarding this issue and I do recommend you to send out a ticket as well.
Please refer to this link for the workaround:
https://community.shopify.com/post/2443997
Hope that helps!