Improving multi-channel subscription stability

Signed-off-by: Adam Engebretson <adam@enge.me>