diff --git a/ccnode/node.py b/ccnode/node.py
index bef05d593f06676f256a9502e1e0d96db9cace74..211c83094f61da6dcccf6e5e54c5325da9a9254c 100644
--- a/ccnode/node.py
+++ b/ccnode/node.py
@@ -7,7 +7,7 @@ from functools import partial
 
 import pyev
 from sjrpc.core import RpcConnection
-from sjrpc.utils import ConnectionProxy, RpcHandler
+from sjrpc.utils import ConnectionProxy, RpcHandler, threadless
 
 from ccnode import __version__
 from ccnode.config import NodeConfigParser
@@ -168,7 +168,7 @@ class MainLoop(object):
         )
         # handlers
         self.rpc_handler = dict(
-            get_tags=partial(get_tags, self.tag_db['__main__']),
+            get_tags=partial(threadless(get_tags), self.tag_db['__main__']),
             sub_tags=self.sub_tags,
         )
 
@@ -176,6 +176,7 @@ class MainLoop(object):
         self.registered_plugins = set()
 
     # RPC handlers definitions
+    @threadless
     def sub_tags(self, sub_id, tags=None, noresolve_tags=None):
         if sub_id == '__main__':
             # FIXME should we raise ?