fix: future cancellation resulted in reset, retry endpoints fialing

[Gaisberg]

Pull Request Check List

Resolves: #772

This also removes redundant state determination and the item is assigned a state, not sure if its the best approach.