diff --git a/Config.h b/Config.h
index 8740e0a..6b66e80 100644
--- a/Config.h
+++ b/Config.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#define NUKI_HUB_VERSION "8.31-pre-1"
+#define NUKI_HUB_VERSION "8.31"
 
 #define MQTT_QOS_LEVEL 1
 #define MQTT_CLEAN_SESSIONS false
diff --git a/networkDevices/WifiDevice.cpp b/networkDevices/WifiDevice.cpp
index ced1a72..a90ff82 100644
--- a/networkDevices/WifiDevice.cpp
+++ b/networkDevices/WifiDevice.cpp
@@ -91,7 +91,12 @@ void WifiDevice::initialize()
         res = _wm.autoConnect(); // password protected ap
     }
 
-    if(!res) {
+    if(!res)
+    {
+        esp_wifi_disconnect ();
+        esp_wifi_stop ();
+        esp_wifi_deinit ();
+
         Log->println(F("Failed to connect. Wait for ESP restart."));
         delay(1000);
         restartEsp(RestartReason::WifiInitFailed);
diff --git a/webflash/nuki_hub.bin b/webflash/nuki_hub.bin
index 42b8a56..fb0ade3 100644
Binary files a/webflash/nuki_hub.bin and b/webflash/nuki_hub.bin differ