diff --git a/components/esp32/cpu_start.c b/components/esp32/cpu_start.c
index 001d1706e..5278f9b16 100644
--- a/components/esp32/cpu_start.c
+++ b/components/esp32/cpu_start.c
@@ -294,7 +294,7 @@ static void do_phy_init()
 
     esp_phy_init(init_data, calibration_mode, cal_data);
 
-    if (calibration_mode != PHY_RF_CAL_NONE) {
+    if (calibration_mode != PHY_RF_CAL_NONE && err != ESP_OK) {
         err = esp_phy_store_cal_data_to_nvs(cal_data);
     } else {
         err = ESP_OK;