Hey @Jan_Wielemaker,
@dan just committed a new feature to try and solve this nuisance.
https://github.com/discourse/discourse/pull/8459