Add an option to avoid remote server wifi access issue