diff --git a/tools/cmake/build.cmake b/tools/cmake/build.cmake
index 9285a53e1..1d11e04a5 100644
--- a/tools/cmake/build.cmake
+++ b/tools/cmake/build.cmake
@@ -220,6 +220,10 @@ function(__build_expand_requirements component_target)
     idf_build_get_property(build_component_targets __BUILD_COMPONENT_TARGETS)
     if(NOT component_target IN_LIST build_component_targets)
         idf_build_set_property(__BUILD_COMPONENT_TARGETS ${component_target} APPEND)
+        __component_get_property(component_lib ${component_target} COMPONENT_LIB)
+        idf_build_set_property(__BUILD_COMPONENTS ${component_lib} APPEND)
+        __component_get_property(component_alias ${component_target} COMPONENT_ALIAS)
+        idf_build_set_property(BUILD_COMPONENTS ${component_alias} APPEND)
     endif()
 endfunction()
 
diff --git a/tools/cmake/component.cmake b/tools/cmake/component.cmake
index a7f099e4b..aec650a60 100644
--- a/tools/cmake/component.cmake
+++ b/tools/cmake/component.cmake
@@ -481,10 +481,6 @@ function(idf_component_register)
     # Set dependencies
     __component_set_all_dependencies()
 
-    # Add the component to built components
-    idf_build_set_property(__BUILD_COMPONENTS ${component_lib} APPEND)
-    idf_build_set_property(BUILD_COMPONENTS ${component_alias} APPEND)
-
     # Make the COMPONENT_LIB variable available in the component CMakeLists.txt
     set(COMPONENT_LIB ${component_lib} PARENT_SCOPE)
     # COMPONENT_TARGET is deprecated but is made available with same function