diff --git a/components/esp_system/Kconfig b/components/esp_system/Kconfig
index 03cc73d750..e8ed1f928c 100644
--- a/components/esp_system/Kconfig
+++ b/components/esp_system/Kconfig
@@ -101,7 +101,7 @@ menu "ESP System Settings"
         default y if IDF_TARGET_ESP32S3
         default y if IDF_TARGET_ESP32H4
         default y if IDF_TARGET_ESP32C6
-        default n if IDF_TARGET_ESP32H2 # IDF-5667 & IDF-6847
+        default n if IDF_TARGET_ESP32H2 # IDF-5667
         depends on SOC_RTC_FAST_MEM_SUPPORTED
 
     config ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP
diff --git a/components/mbedtls/test_apps/main/test_esp_crt_bundle.c b/components/mbedtls/test_apps/main/test_esp_crt_bundle.c
index 8eb34f2b0e..a4b0af46a5 100644
--- a/components/mbedtls/test_apps/main/test_esp_crt_bundle.c
+++ b/components/mbedtls/test_apps/main/test_esp_crt_bundle.c
@@ -35,8 +35,6 @@
 #define SERVER_ADDRESS "localhost"
 #define SERVER_PORT "4433"
 
-#if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32H2) // IDF-6847
-
 extern const uint8_t server_cert_chain_pem_start[] asm("_binary_server_cert_chain_pem_start");
 extern const uint8_t server_cert_chain_pem_end[]   asm("_binary_server_cert_chain_pem_end");
 
@@ -487,5 +485,3 @@ TEST_CASE("custom certificate bundle init API - bound checking", "[mbedtls]")
 
     esp_crt_bundle_detach(NULL);
 }
-
-#endif // !TEMPORARY_DISABLED_FOR_TARGETS(ESP32H2)