Revert "Don't send channel to client if default"

This reverts commit e3105a9aa1385945de286c287bc4eebf16df7aac.