diff --git a/components/esp_phy/src/phy_init.c b/components/esp_phy/src/phy_init.c
index 2d6f62d8fd..1e77afc0cc 100644
--- a/components/esp_phy/src/phy_init.c
+++ b/components/esp_phy/src/phy_init.c
@@ -642,6 +642,13 @@ const esp_phy_init_data_t* esp_phy_get_init_data(void)
         assert(memcmp(init_data_store + init_data_store_length - sizeof(phy_init_magic_post),
                       PHY_INIT_MAGIC, sizeof(phy_init_magic_post)) == 0);
 
+        err = esp_partition_erase_range(partition, 0, partition->size);
+        if (err != ESP_OK) {
+            ESP_LOGE(TAG, "failed to erase partition (0x%x)!", err);
+            free(init_data_store);
+            return NULL;
+        }
+
         // write default data
         err = esp_partition_write(partition, 0, init_data_store, init_data_store_length);
         if (err != ESP_OK) {
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index 603ef1ff41..8d4703d70e 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit 603ef1ff4107b628751bccf6a8cd2fff8b8fc364
+Subproject commit 8d4703d70e18a658d299fdcd4bb56b6aaa5a8e8a