diff --git a/core/lib/Thelia/Model/Category.php b/core/lib/Thelia/Model/Category.php
index 1b4582fd0..e5c9708db 100644
--- a/core/lib/Thelia/Model/Category.php
+++ b/core/lib/Thelia/Model/Category.php
@@ -64,10 +64,10 @@ class Category extends BaseCategory
     public function getRoot($categoryId)
     {
 
-        $category = CategoryQuery::create()->findOneById($categoryId);
+        $category = CategoryQuery::create()->findPk($categoryId);
 
         if(0 !== $category->getParent()) {
-            $parentCategory = CategoryQuery::create()->findOneById($category->getParent());
+            $parentCategory = CategoryQuery::create()->findPk($category->getParent());
 
             if (null !== $parentCategory) {
                 $categoryId = $this->getRoot($parentCategory->getId());
diff --git a/core/lib/Thelia/Model/Folder.php b/core/lib/Thelia/Model/Folder.php
index c016aefe2..31ba041c4 100644
--- a/core/lib/Thelia/Model/Folder.php
+++ b/core/lib/Thelia/Model/Folder.php
@@ -63,10 +63,10 @@ class Folder extends BaseFolder
     public function getRoot($folderId)
     {
 
-        $folder = FolderQuery::create()->findOneById($folderId);
+        $folder = FolderQuery::create()->findPk($folderId);
 
         if(0 !== $folder->getParent()) {
-            $parentFolder = FolderQuery::create()->findOneById($folder->getParent());
+            $parentFolder = FolderQuery::create()->findPk($folder->getParent());
 
             if (null !== $parentFolder) {
                 $folderId = $this->getRoot($parentFolder->getId());