Remove the disconnect to avoid race condition