Whoops I even had the change ready just missed it! https://github.com/matrix-org/synapse/pull/13242/commits/69cd4777217c9420b7557fcca600fb396ec0b476 + https://github.com/matrix-org/synapse/pull/13242/commits/a187d9a97f2b6a09baa480b9c63d39d6e918bfc6