diff --git a/components/esp32h2/Kconfig b/components/esp32h2/Kconfig
index 4413c4b0e5..f8e7f6fc56 100644
--- a/components/esp32h2/Kconfig
+++ b/components/esp32h2/Kconfig
@@ -10,10 +10,13 @@ menu "ESP32H2-Specific"
 
         config ESP32H2_DEFAULT_CPU_FREQ_16
             bool "16 MHz"
+            depends on IDF_ENV_FPGA     #ESP32H2-TODO: IDF-3786
         config ESP32H2_DEFAULT_CPU_FREQ_32
             bool "32 MHz"
+            depends on IDF_ENV_FPGA     #ESP32H2-TODO: IDF-3786
         config ESP32H2_DEFAULT_CPU_FREQ_64
             bool "64 MHz"
+            depends on IDF_ENV_FPGA     #ESP32H2-TODO: IDF-3786
         config ESP32H2_DEFAULT_CPU_FREQ_96
             bool "96 MHz"
             depends on !IDF_ENV_FPGA
diff --git a/components/soc/esp32h2/include/soc/soc.h b/components/soc/esp32h2/include/soc/soc.h
index bca83126d5..242c6eeab4 100644
--- a/components/soc/esp32h2/include/soc/soc.h
+++ b/components/soc/esp32h2/include/soc/soc.h
@@ -228,7 +228,7 @@
 #if CONFIG_IDF_ENV_FPGA
 #define  APB_CLK_FREQ                                ( 32*1000000 )
 #else
-#define  APB_CLK_FREQ                                ( 96*1000000 )
+#define  APB_CLK_FREQ                                ( 48*1000000 )         //ESP32H2-TODO: IDF-3786
 #endif
 #define  REF_CLK_FREQ                                ( 1000000 )
 #define  RTC_CLK_FREQ                                (17.5*1000000)