Fix problem while switching between channels

(close #100041 and #100096)