Fix logic for channel notifications