Fix infinite loop on connection loss