diff --git a/Entity/ClientManager.php b/Entity/ClientManager.php
index 346c9732..b0699530 100644
--- a/Entity/ClientManager.php
+++ b/Entity/ClientManager.php
@@ -14,7 +14,6 @@
 namespace FOS\OAuthServerBundle\Entity;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\EntityRepository;
 use FOS\OAuthServerBundle\Model\ClientInterface;
 use FOS\OAuthServerBundle\Model\ClientManager as BaseClientManager;
 
@@ -25,11 +24,6 @@ class ClientManager extends BaseClientManager
      */
     protected $em;
 
-    /**
-     * @var EntityRepository
-     */
-    protected $repository;
-
     /**
      * @var string
      */
@@ -37,12 +31,7 @@ class ClientManager extends BaseClientManager
 
     public function __construct(EntityManagerInterface $em, $class)
     {
-        // NOTE: bug in Doctrine, hinting EntityRepository|ObjectRepository when only EntityRepository is expected
-        /** @var EntityRepository $repository */
-        $repository = $em->getRepository($class);
-
         $this->em = $em;
-        $this->repository = $repository;
         $this->class = $class;
     }
 
@@ -59,7 +48,7 @@ public function getClass()
      */
     public function findClientBy(array $criteria)
     {
-        return $this->repository->findOneBy($criteria);
+        return $this->em->getRepository($this->class)->findOneBy($criteria);
     }
 
     /**
diff --git a/Entity/TokenManager.php b/Entity/TokenManager.php
index 4a87c17f..207aafd6 100644
--- a/Entity/TokenManager.php
+++ b/Entity/TokenManager.php
@@ -14,7 +14,6 @@
 namespace FOS\OAuthServerBundle\Entity;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\EntityRepository;
 use FOS\OAuthServerBundle\Model\TokenInterface;
 use FOS\OAuthServerBundle\Model\TokenManager as BaseTokenManager;
 
@@ -25,11 +24,6 @@ class TokenManager extends BaseTokenManager
      */
     protected $em;
 
-    /**
-     * @var EntityRepository
-     */
-    protected $repository;
-
     /**
      * @var string
      */
@@ -37,12 +31,7 @@ class TokenManager extends BaseTokenManager
 
     public function __construct(EntityManagerInterface $em, $class)
     {
-        // NOTE: bug in Doctrine, hinting EntityRepository|ObjectRepository when only EntityRepository is expected
-        /** @var EntityRepository $repository */
-        $repository = $em->getRepository($class);
-
         $this->em = $em;
-        $this->repository = $repository;
         $this->class = $class;
     }
 
@@ -59,7 +48,7 @@ public function getClass()
      */
     public function findTokenBy(array $criteria)
     {
-        return $this->repository->findOneBy($criteria);
+        return $this->em->getRepository($this->class)->findOneBy($criteria);
     }
 
     /**
@@ -85,7 +74,7 @@ public function deleteToken(TokenInterface $token)
      */
     public function deleteExpired()
     {
-        $qb = $this->repository->createQueryBuilder('t');
+        $qb = $this->em->getRepository($this->class)->createQueryBuilder('t');
         $qb
             ->delete()
             ->where('t.expiresAt < ?1')