Make disconnect response handling consistent