I did a bit of work here, and was able to fix the problem for the PWA. Will be merging soon after all the tests on CI pass.
I could not reproduce the issue on Safari on iOS, only the PWA and Hub. The Hub will need a little additional work on the Hub itself — I will do a follow-up to try to fix it there.