I’m being told that the Firestore web SDK did some recent changes to make this sort of thing easier, but I’m not aware of any details. Best option would be to raise this on StackOverflow or directly file an issue at https://github.com/firebase/firebase-js-sdk