diff --git a/src/mesh/NodeDB.h b/src/mesh/NodeDB.h
index b726962fd..4fd77d62b 100644
--- a/src/mesh/NodeDB.h
+++ b/src/mesh/NodeDB.h
@@ -13,7 +13,7 @@ DeviceState versions used to be defined in the .proto file but really only this
 #define here.
 */
 
-#define DEVICESTATE_CUR_VER 15
+#define DEVICESTATE_CUR_VER 16
 #define DEVICESTATE_MIN_VER DEVICESTATE_CUR_VER
 
 extern DeviceState devicestate;
diff --git a/src/mesh/http/WiFiAPClient.cpp b/src/mesh/http/WiFiAPClient.cpp
index 830cd3ce7..161ba2a64 100644
--- a/src/mesh/http/WiFiAPClient.cpp
+++ b/src/mesh/http/WiFiAPClient.cpp
@@ -62,7 +62,7 @@ static int32_t reconnectWiFi()
     const char *wifiName = config.wifi.ssid;
     const char *wifiPsw = config.wifi.psk;
 
-    if (needReconnect && !WiFi.isConnected()) {
+    if (config.wifi.enabled && needReconnect && !WiFi.isConnected()) {
         // if (radioConfig.has_preferences && needReconnect && !WiFi.isConnected()) {
 
         if (!*wifiPsw) // Treat empty password as no password
@@ -184,7 +184,7 @@ bool initWifi(bool forceSoftAP)
 {
     forcedSoftAP = forceSoftAP;
 
-    if ((config.wifi.ssid[0]) || forceSoftAP) {
+    if (config.wifi.enabled && ((config.wifi.ssid[0]) || forceSoftAP)) {
         // if ((radioConfig.has_preferences && config.wifi.ssid[0]) || forceSoftAP) {
         const char *wifiName = config.wifi.ssid;
         const char *wifiPsw = config.wifi.psk;
diff --git a/src/modules/AdminModule.cpp b/src/modules/AdminModule.cpp
index b1f5cc928..20ce7beeb 100644
--- a/src/modules/AdminModule.cpp
+++ b/src/modules/AdminModule.cpp
@@ -191,6 +191,7 @@ void AdminModule::handleSetConfig(const Config &c)
             DEBUG_MSG("Setting config: WiFi\n");
             config.has_wifi = true;
             config.wifi = c.payloadVariant.wifi;
+            requiresReboot = true;
             break;
         case Config_display_tag:
             DEBUG_MSG("Setting config: Display\n");