diff --git a/Classes/Service/TaxonomyService.php b/Classes/Service/TaxonomyService.php
index 70733b9..01feec9 100644
--- a/Classes/Service/TaxonomyService.php
+++ b/Classes/Service/TaxonomyService.php
@@ -131,13 +131,10 @@ public function getRoot(Context $context = null)
             return $this->taxonomyDataRootNodes[$contextHash];
         }
 
-        // return existing root-node
-        //
-        // TODO: Find a better way to determine the root node
-        $taxonomyDataRootNodeData = $this->nodeDataRepository->findOneByPath(
-            '/' . $this->getRootNodeName(),
-            $context->getWorkspace()
-        );
+        $taxonomyDataRootNode = $context->getNode('/'.$this->getRootNodeName());
+        if ($taxonomyDataRootNode instanceof NodeInterface) {
+            $taxonomyDataRootNodeData = $taxonomyDataRootNode->getNodeData();
+        }
 
         if ($taxonomyDataRootNodeData !== null) {
             $this->taxonomyDataRootNodes[$contextHash] = $this->nodeFactory->createFromNodeData(