diff --git a/components/esp_hw_support/port/esp32c6/rtc_clk.c b/components/esp_hw_support/port/esp32c6/rtc_clk.c
index 3beac67c3c..015a002562 100644
--- a/components/esp_hw_support/port/esp32c6/rtc_clk.c
+++ b/components/esp_hw_support/port/esp32c6/rtc_clk.c
@@ -362,6 +362,7 @@ soc_xtal_freq_t rtc_clk_xtal_freq_get(void)
     uint32_t xtal_freq_mhz = clk_ll_xtal_load_freq_mhz();
     if (xtal_freq_mhz == 0) {
         ESP_HW_LOGW(TAG, "invalid RTC_XTAL_FREQ_REG value, assume 40MHz");
+        clk_ll_xtal_store_freq_mhz(SOC_XTAL_FREQ_40M);
         return SOC_XTAL_FREQ_40M;
     }
     return (soc_xtal_freq_t)xtal_freq_mhz;
diff --git a/components/esp_system/port/brownout.c b/components/esp_system/port/brownout.c
index cce5f65def..d90dcc911a 100644
--- a/components/esp_system/port/brownout.c
+++ b/components/esp_system/port/brownout.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -16,6 +16,7 @@
 #include "soc/soc.h"
 #include "soc/rtc_periph.h"
 #include "esp_attr.h"
+#include "esp_rom_sys.h"
 #include "bootloader_flash.h"
 #include "esp_intr_alloc.h"
 #include "hal/brownout_hal.h"
@@ -56,7 +57,10 @@ IRAM_ATTR static void rtc_brownout_isr_handler(void *arg)
         ESP_DRAM_LOGI(TAG, "Brownout detector was triggered\r\n\r\n");
     }
 
-    esp_restart_noos();
+    esp_rom_software_reset_system();
+    while (true) {
+        ;
+    }
 }
 #endif // CONFIG_ESP_SYSTEM_BROWNOUT_INTR