diff --git a/ros2cli/ros2cli/daemon/__init__.py b/ros2cli/ros2cli/daemon/__init__.py
index 4ddad6ff0..4860a1b6e 100644
--- a/ros2cli/ros2cli/daemon/__init__.py
+++ b/ros2cli/ros2cli/daemon/__init__.py
@@ -71,6 +71,8 @@ def main(*, script_name='_ros2_daemon', argv=None):
                 _print_invoked_function_name(node.get_namespace))
             server.register_function(
                 _print_invoked_function_name(node.get_node_names_and_namespaces))
+            server.register_function(
+                _print_invoked_function_name(node.get_node_names_and_namespaces_with_enclaves))
             server.register_function(
                 _print_invoked_function_name(node.get_topic_names_and_types))
             server.register_function(
diff --git a/ros2cli/test/test_daemon.py b/ros2cli/test/test_daemon.py
index e6788bf0f..686a73406 100644
--- a/ros2cli/test/test_daemon.py
+++ b/ros2cli/test/test_daemon.py
@@ -28,6 +28,7 @@
 
 TEST_NODE_NAME = 'test_node'
 TEST_NODE_NAMESPACE = '/test'
+TEST_NODE_ENCLAVE = '/'
 TEST_TOPIC_NAME = '/test/topic'
 TEST_TOPIC_TYPE = 'test_msgs/msg/Empty'
 TEST_TOPIC_PUBLISHER_QOS = rclpy.qos.QoSProfile(
@@ -124,6 +125,11 @@ def test_get_node_names_and_namespaces(daemon_node):
     assert [TEST_NODE_NAME, TEST_NODE_NAMESPACE] in node_names_and_namespaces
 
 
+def test_get_node_names_and_namespaces_with_enclaves(daemon_node):
+    node_names_and_namespaces = daemon_node.get_node_names_and_namespaces_with_enclaves()
+    assert [TEST_NODE_NAME, TEST_NODE_NAMESPACE, TEST_NODE_ENCLAVE] in node_names_and_namespaces
+
+
 def test_get_topic_names_and_types(daemon_node):
     topic_names_and_types = daemon_node.get_topic_names_and_types()
     assert [TEST_TOPIC_NAME, [TEST_TOPIC_TYPE]] in topic_names_and_types