Improve reliability of active mode and prevent loopback issues