Fixed issue with too many room switch messages