diff --git a/components/esp_phy/src/btbb_init.c b/components/esp_phy/src/btbb_init.c
index 5939ec0e28..4a1841cfda 100644
--- a/components/esp_phy/src/btbb_init.c
+++ b/components/esp_phy/src/btbb_init.c
@@ -22,11 +22,11 @@ static uint8_t s_btbb_access_ref = 0;
 #include "btbb_retention_reg.h"
 static const char* TAG = "btbb_init";
 
-// #if SOC_PM_RETENTION_HAS_CLOCK_BUG
-// #define BTBB_LINK_OWNER  ENTRY(3)
-// #else
+#if SOC_PM_RETENTION_HAS_CLOCK_BUG
+#define BTBB_LINK_OWNER  ENTRY(3)
+#else
 #define BTBB_LINK_OWNER  ENTRY(0) | ENTRY(2)
-// #endif // SOC_PM_RETENTION_HAS_CLOCK_BUG
+#endif // SOC_PM_RETENTION_HAS_CLOCK_BUG
 
 static esp_err_t btbb_sleep_retention_init(void)
 {
diff --git a/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in b/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in
index 11b7544a2c..e80aec35f6 100644
--- a/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in
+++ b/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in
@@ -1183,10 +1183,6 @@ config SOC_PM_RETENTION_HAS_REGDMA_POWER_BUG
     bool
     default y
 
-config SOC_PM_RETENTION_HAS_CLOCK_BUG
-    bool
-    default y
-
 config SOC_CLK_RC_FAST_SUPPORT_CALIBRATION
     bool
     default y
diff --git a/components/soc/esp32h2/include/soc/soc_caps.h b/components/soc/esp32h2/include/soc/soc_caps.h
index 4467ab10bf..e2080e6c47 100644
--- a/components/soc/esp32h2/include/soc/soc_caps.h
+++ b/components/soc/esp32h2/include/soc/soc_caps.h
@@ -487,7 +487,6 @@
 #define SOC_PM_MODEM_RETENTION_BY_REGDMA           (1)
 #define SOC_PM_SUPPORT_DEEPSLEEP_CHECK_STUB_ONLY   (1) /*!<Supports CRC only the stub code in RTC memory */
 #define SOC_PM_RETENTION_HAS_REGDMA_POWER_BUG      (1)
-#define SOC_PM_RETENTION_HAS_CLOCK_BUG      (1)
 
 /*-------------------------- CLOCK SUBSYSTEM CAPS ----------------------------------------*/
 #define SOC_CLK_RC_FAST_SUPPORT_CALIBRATION       (1)