diff --git a/src/Wallabag/CoreBundle/Controller/Api/DeveloperController.php b/src/Wallabag/CoreBundle/Controller/Api/DeveloperController.php
index 1bc665763..e0091f21f 100644
--- a/src/Wallabag/CoreBundle/Controller/Api/DeveloperController.php
+++ b/src/Wallabag/CoreBundle/Controller/Api/DeveloperController.php
@@ -9,9 +9,9 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Wallabag\ApiBundle\Form\Type\ClientType;
-use Wallabag\ApiBundle\Repository\ClientRepository;
 use Wallabag\CoreBundle\Controller\AbstractController;
 use Wallabag\CoreBundle\Entity\Api\Client;
+use Wallabag\CoreBundle\Repository\Api\ClientRepository;
 
 class DeveloperController extends AbstractController
 {
diff --git a/src/Wallabag/CoreBundle/Entity/Api/Client.php b/src/Wallabag/CoreBundle/Entity/Api/Client.php
index 83461f5ce..6a18cb8b3 100644
--- a/src/Wallabag/CoreBundle/Entity/Api/Client.php
+++ b/src/Wallabag/CoreBundle/Entity/Api/Client.php
@@ -12,7 +12,7 @@ use Wallabag\CoreBundle\Entity\User;
 
 /**
  * @ORM\Table("oauth2_clients")
- * @ORM\Entity(repositoryClass="Wallabag\ApiBundle\Repository\ClientRepository")
+ * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\Api\ClientRepository")
  */
 class Client extends BaseClient
 {
diff --git a/src/Wallabag/ApiBundle/Repository/ClientRepository.php b/src/Wallabag/CoreBundle/Repository/Api/ClientRepository.php
similarity index 94%
rename from src/Wallabag/ApiBundle/Repository/ClientRepository.php
rename to src/Wallabag/CoreBundle/Repository/Api/ClientRepository.php
index ab9325836..b991207e2 100644
--- a/src/Wallabag/ApiBundle/Repository/ClientRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/Api/ClientRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ApiBundle\Repository;
+namespace Wallabag\CoreBundle\Repository\Api;
 
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;