Fixes #15756
Co-authored-by: Olivier Wilkinson (reivilibre) <oliverw@matrix.org> Co-authored-by: Shay <hillerys@element.io>
Signed-off-by: Sean Quah <seanq@matrix.org>