Fix issue where more rooms are broadcast to than expected