diff --git a/src/sysrepo_access.cpp b/src/sysrepo_access.cpp
index a75c5e8..c18ff31 100644
--- a/src/sysrepo_access.cpp
+++ b/src/sysrepo_access.cpp
@@ -312,10 +312,14 @@
         inputNode->merge(node, 0);
     }
 
+    Tree res;
     auto output = m_session->rpc_send(inputNode);
-    DatastoreAccess::Tree resTree;
-    lyNodesToTree(resTree, {output}, joinPaths(path, "/"));
-    return resTree;
+    if (output) {
+        // The output is "some top-level node". If we actually want the output of our RPC/action we need to use
+        // find_path.
+        lyNodesToTree(res, output->find_path(path.c_str())->data(), joinPaths(path, "/"));
+    }
+    return res;
 }
 
 void SysrepoAccess::copyConfig(const Datastore source, const Datastore destination)