(#1524) - Dont duplicate cancelled calls in adapters