diff --git a/lib/tessel/wifi.js b/lib/tessel/wifi.js
index c425965e..5544a3f7 100644
--- a/lib/tessel/wifi.js
+++ b/lib/tessel/wifi.js
@@ -121,7 +121,9 @@ Tessel.prototype.connectToNetwork = function(opts) {
 
   if (password && security) {
     status += `, password: ${password}, security: ${security}`;
-  } else if (!password && (!security || security === 'none')) {
+  }
+
+  if (!password && !security) {
     security = 'none';
   }
 
@@ -213,7 +215,8 @@ Tessel.prototype.setWiFiState = function(enable) {
             }
             this.receive(remoteProcess, (err, result) => {
               if (err) {
-                if (err.toString().includes('Not found')) {
+                if (err.toString().includes('Not found') && tries) {
+                  tries--;
                   return pollForWifiSignal();
                 } else {
                   return reject(err);