diff --git a/src/PreferencesKeys.h b/src/PreferencesKeys.h
index 1e3190e..16b7c3e 100644
--- a/src/PreferencesKeys.h
+++ b/src/PreferencesKeys.h
@@ -3,7 +3,7 @@
 #include <vector>
 #include "Config.h"
 #ifndef CONFIG_IDF_TARGET_ESP32H2
-#include "esp_wifi.h"
+#include <WiFi.h>
 #endif
 
 //CHANGE REQUIRES REBOOT TO TAKE EFFECT
@@ -143,7 +143,7 @@ inline void initPreferences(Preferences* preferences)
     if(firstStart)
     {
         Serial.println("First start, setting preference defaults");
-        
+
         preferences->putBool(preference_started_before, true);
         preferences->putBool(preference_lock_enabled, true);
         uint32_t aclPrefs[17] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
@@ -156,29 +156,8 @@ inline void initPreferences(Preferences* preferences)
         preferences->putBytes(preference_conf_lock_advanced_acl, (byte*)(&advancedLockConfigAclPrefs), sizeof(advancedLockConfigAclPrefs));
         uint32_t advancedOpenerConfigAclPrefs[21] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
         preferences->putBytes(preference_conf_opener_advanced_acl, (byte*)(&advancedOpenerConfigAclPrefs), sizeof(advancedOpenerConfigAclPrefs));
-
-#ifndef CONFIG_IDF_TARGET_ESP32H2
-        wifi_config_t wifi_cfg;
-        if(esp_wifi_get_config(WIFI_IF_STA, &wifi_cfg) != ESP_OK)
-        {
-            Serial.println("Failed to get Wi-Fi configuration in RAM");
-        }
-
-        if (esp_wifi_set_storage(WIFI_STORAGE_FLASH) != ESP_OK)
-        {
-            Serial.println("Failed to set storage Wi-Fi");
-        }
-
-        memset(wifi_cfg.sta.ssid, 0, sizeof(wifi_cfg.sta.ssid));
-        memset(wifi_cfg.sta.password, 0, sizeof(wifi_cfg.sta.password));
-
-        if (esp_wifi_set_config(WIFI_IF_STA, &wifi_cfg) != ESP_OK)
-        {
-            Serial.println("Failed to clear NVS Wi-Fi configuration");
-        }
-#endif
         preferences->putString(preference_mqtt_lock_path, "nukihub");
-        
+
         preferences->putBool(preference_check_updates, true);
         preferences->putBool(preference_opener_continuous_mode, false);
         preferences->putBool(preference_official_hybrid_enabled, false);
@@ -219,7 +198,12 @@ inline void initPreferences(Preferences* preferences)
         preferences->putInt(preference_query_interval_lockstate, 1800);
         preferences->putInt(preference_query_interval_configuration, 3600);
         preferences->putInt(preference_query_interval_battery, 1800);
-        preferences->putInt(preference_query_interval_keypad, 1800);  
+        preferences->putInt(preference_query_interval_keypad, 1800);
+
+#ifndef CONFIG_IDF_TARGET_ESP32H2
+        WiFi.begin();
+        WiFi.disconnect(true, true);
+#endif        
     }
     else
     {
diff --git a/src/networkDevices/WifiDevice.cpp b/src/networkDevices/WifiDevice.cpp
index 3481645..58c76bc 100644
--- a/src/networkDevices/WifiDevice.cpp
+++ b/src/networkDevices/WifiDevice.cpp
@@ -111,13 +111,7 @@ void WifiDevice::initialize()
                     }
                 }
 
-                memset(wifi_cfg.sta.ssid, 0, sizeof(wifi_cfg.sta.ssid));
-                memset(wifi_cfg.sta.password, 0, sizeof(wifi_cfg.sta.password));
-
-                if (esp_wifi_set_config(WIFI_IF_STA, &wifi_cfg) != ESP_OK)
-                {
-                    Log->println("Failed to clear NVS Wi-Fi configuration");
-                }
+                WiFi.disconnect(true, true);
 
                 if(found)
                 {