HUE-2123 [beeswax] Handle cancel state properly