Fix joining when no message exists