diff --git a/CMakeLists.txt b/CMakeLists.txt
index 416c2c332..4914ee0d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,7 +92,7 @@ if ( ament_cmake_FOUND )
     message(STATUS "------------------------------------------")
     include(cmake/ament_build.cmake)
 
-    find_package(tinyxml2_vendor REQUIRED)
+    find_package(tinyxml2_vendor QUIET)
     find_package(TinyXML2 REQUIRED)
 else()
     message(STATUS "------------------------------------------")
diff --git a/package.xml b/package.xml
index b41fd115b..f32765a55 100644
--- a/package.xml
+++ b/package.xml
@@ -22,8 +22,8 @@
 
   <depend>libsqlite3-dev</depend>
   <depend>libzmq3-dev</depend>
-  <depend>tinyxml2</depend>
-  <depend>tinyxml2_vendor</depend>
+  <depend condition="$ROS_DISTRO != humble and $ROS_DISTRO != jazzy and $ROS_DISTRO != kilted">tinyxml2</depend>
+  <depend condition="$ROS_DISTRO == humble or $ROS_DISTRO == jazzy or $ROS_DISTRO == kilted">tinyxml2_vendor</depend>
 
   <test_depend >ament_cmake_gtest</test_depend>