This was way more trickier than expected, I think this should fix it:
https://github.com/discourse/discourse/pull/9305
I have asked multiple reviews and it might take time to merge, thanks again for the detailed repro 
5 Likes