add channel checks after upstream