diff --git a/rmw_zenoh_cpp/src/detail/rmw_context_impl_s.hpp b/rmw_zenoh_cpp/src/detail/rmw_context_impl_s.hpp
index faf533b3..be14ce0b 100644
--- a/rmw_zenoh_cpp/src/detail/rmw_context_impl_s.hpp
+++ b/rmw_zenoh_cpp/src/detail/rmw_context_impl_s.hpp
@@ -49,6 +49,8 @@ class rmw_context_impl_s final
   std::string enclave() const;
 
   // Loan the Zenoh session.
+  // TODO(Yadunund): Remove this API once rmw_context_impl_s is updated to
+  // create other Zenoh objects.
   z_session_t session() const;
 
   // Get a reference to the shm_manager.