Index: sources/device/DeviceController.cpp
===================================================================
diff -u -rb38e1590d137f607b982d336e60b614c2ae685c2 -raad4ef16cb210459b60d16aa01a4dcbd909d9a1f
--- sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision b38e1590d137f607b982d336e60b614c2ae685c2)
+++ sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision aad4ef16cb210459b60d16aa01a4dcbd909d9a1f)
@@ -253,20 +253,23 @@
  */
 void DeviceController::checkWiFi()
 {
-    QString mIP  = tr("No WiFi");
+    QString mIP  = tr("WiFi Connection Error");
 
-    const QNetworkInterface dev = QNetworkInterface::interfaceFromName("wlan0");
+    if (_wifiValid) {
+        mIP  = tr("No WiFi");
+        const QNetworkInterface dev = QNetworkInterface::interfaceFromName("wlan0");
 
-    if ( dev.isValid() ) {
-        auto addresses = dev.addressEntries();
+        if ( dev.isValid() ) {
+            auto addresses = dev.addressEntries();
 
-        if ( addresses.count() ) {
-            if ( dev.flags().testFlag(QNetworkInterface::IsUp) && dev.flags().testFlag(QNetworkInterface::IsRunning) ) {
-                mIP = addresses.first().ip().toString();
+            if ( addresses.count() ) {
+                if ( dev.flags().testFlag(QNetworkInterface::IsUp) && dev.flags().testFlag(QNetworkInterface::IsRunning) ) {
+                    mIP = addresses.first().ip().toString();
+                }
+                else {
+                    mIP = tr("WiFi Not Connected");
+                }
             }
-            else {
-                mIP = tr("WiFi Not Connected");
-            }
         }
     }
 
@@ -1076,6 +1079,8 @@
     TimedProcess *timedProcess = new TimedProcess(&_processWifiInfo, script, timeout_ms, {});
     timedProcess->start();
 
+    _wifiValid = true;
+
     MDeviceWifiInfoResponse model;
     model._data.mCompleted  = false;
     model._data.mAccepted   = false;
Index: sources/device/DeviceController.h
===================================================================
diff -u -rb38e1590d137f607b982d336e60b614c2ae685c2 -raad4ef16cb210459b60d16aa01a4dcbd909d9a1f
--- sources/device/DeviceController.h	(.../DeviceController.h)	(revision b38e1590d137f607b982d336e60b614c2ae685c2)
+++ sources/device/DeviceController.h	(.../DeviceController.h)	(revision aad4ef16cb210459b60d16aa01a4dcbd909d9a1f)
@@ -221,6 +221,7 @@
 
     bool        _hasThread           = false;
     bool        _hasSalt             = false;
+    bool        _wifiValid           = false;
 
     //TODO: all of these should use the TimesProcess (instead of QProcess)
     //      to be able to kill the process automatically after the set time out.