Fixes #4873. Unfortunately this will introduce a slight delay but I don't see any other quick & reasonable solution.