diff --git a/src/yang_schema.cpp b/src/yang_schema.cpp
index d354069..e18c780 100644
--- a/src/yang_schema.cpp
+++ b/src/yang_schema.cpp
@@ -352,6 +352,11 @@
     for (const auto node : nodes) {
         if (node->module()->name() == "ietf-yang-library"sv)
             continue;
+        // FIXME: This is a temporary fix to filter out RPC nodes in
+        // tab-completion. The method will have to be changed/reworked when RPC
+        // support gets added.
+        if (node->nodetype() == LYS_RPC)
+            continue;
         if (recursion == Recursion::Recursive) {
             for (auto it : node->tree_dfs()) {
                 res.insert(it->path(LYS_PATH_FIRST_PREFIX));
diff --git a/tests/yang.cpp b/tests/yang.cpp
index c5f6fa4..d189f50 100644
--- a/tests/yang.cpp
+++ b/tests/yang.cpp
@@ -296,6 +296,8 @@
         }
     }
 
+    rpc myRpc {}
+
 })";
 
 namespace std {