diff --git a/components/bootloader/subproject/CMakeLists.txt b/components/bootloader/subproject/CMakeLists.txt
index 383f3e80b7..45f0a264db 100644
--- a/components/bootloader/subproject/CMakeLists.txt
+++ b/components/bootloader/subproject/CMakeLists.txt
@@ -27,7 +27,8 @@ set(COMPONENTS
     spi_flash
     micro-ecc
     main
-    efuse)
+    efuse
+    esp_system)
 set(BOOTLOADER_BUILD 1)
 include("${IDF_PATH}/tools/cmake/project.cmake")
 set(common_req log esp_rom esp_common esp_hw_support hal)
diff --git a/components/esp_system/CMakeLists.txt b/components/esp_system/CMakeLists.txt
index df6fe27a5f..f6e9d7b8a2 100644
--- a/components/esp_system/CMakeLists.txt
+++ b/components/esp_system/CMakeLists.txt
@@ -1,3 +1,9 @@
+if(BOOTLOADER_BUILD)
+    # Bootloader relies on some Kconfig options defined in esp_system.
+    idf_component_register()
+    return()
+endif()
+
 idf_component_register(SRCS "intr_alloc.c"
                             "esp_async_memcpy.c"
                             "panic.c"