Fix first join not adding channels properly