Fix empty channel issue