Bugfix/dont cancel channel

@DWvanGeest please review
@dwvangeest (slack test)