diff --git a/cmake/QtConfigDependencies.cmake.in b/cmake/QtConfigDependencies.cmake.in
index 49e08b7ba6d..e16d7259286 100644
--- a/cmake/QtConfigDependencies.cmake.in
+++ b/cmake/QtConfigDependencies.cmake.in
@@ -11,10 +11,6 @@ foreach(_target_dep ${_third_party_deps})
     if(version)
         list(APPEND find_package_args "${version}")
     endif()
-    if(components)
-        string(REPLACE " " ";" components "${components}")
-        list(APPEND find_package_args COMPONENTS ${components})
-    endif()
 
     # Already build an error message, because find_dependency calls return() on failure.
     set(__@INSTALL_CMAKE_NAMESPACE@_message "\nPackage: ${pkg}")
@@ -27,7 +23,12 @@ foreach(_target_dep ${_third_party_deps})
     set(@INSTALL_CMAKE_NAMESPACE@_DEPENDENCY_NOT_FOUND_MESSAGE
         "${__@INSTALL_CMAKE_NAMESPACE@_message}")
 
-    find_dependency(${find_package_args})
+    if(components)
+        string(REPLACE " " ";" components "${components}")
+        find_dependency(${find_package_args} COMPONENTS ${components})
+    else()
+        find_dependency(${find_package_args})
+    endif()
 endforeach()
 
 set(@INSTALL_CMAKE_NAMESPACE@_DEPENDENCIES_FOUND TRUE)
diff --git a/cmake/QtModuleDependencies.cmake.in b/cmake/QtModuleDependencies.cmake.in
index 3d19fac7841..80c5202c9ab 100644
--- a/cmake/QtModuleDependencies.cmake.in
+++ b/cmake/QtModuleDependencies.cmake.in
@@ -15,12 +15,13 @@ foreach(_target_dep ${_third_party_deps})
     if(version)
         list(APPEND find_package_args "${version}")
     endif()
+
     if(components)
         string(REPLACE " " ";" components "${components}")
-        list(APPEND find_package_args COMPONENTS ${components})
+        find_dependency(${find_package_args} COMPONENTS ${components})
+    else()
+        find_dependency(${find_package_args})
     endif()
-
-    find_dependency(${find_package_args})
 endforeach()
 
 # Find Qt tool package.
diff --git a/cmake/QtPluginDependencies.cmake.in b/cmake/QtPluginDependencies.cmake.in
index bae6d85c7b4..ce64b096bbb 100644
--- a/cmake/QtPluginDependencies.cmake.in
+++ b/cmake/QtPluginDependencies.cmake.in
@@ -11,12 +11,13 @@ foreach(_target_dep ${_third_party_deps})
     if(version)
         list(APPEND find_package_args "${version}")
     endif()
+
     if(components)
         string(REPLACE " " ";" components "${components}")
-        list(APPEND find_package_args COMPONENTS ${components})
+        find_dependency(${find_package_args} COMPONENTS ${components})
+    else()
+        find_dependency(${find_package_args})
     endif()
-
-    find_dependency(${find_package_args})
 endforeach()
 
 # note: target_deps example: "Qt6Core\;5.12.0;Qt6Gui\;5.12.0"