diff --git a/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php b/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php
index 635599b777..5040a0bd9c 100644
--- a/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php
+++ b/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php
@@ -139,7 +139,7 @@ class FeedLinkGenerator implements LinkGeneratorInterface
     {
         $token = $this->em
             ->getRepository('Entities\FeedToken')
-            ->findByFeedAndUser($feed, $user);
+            ->findOneBy(array('usr_id' => $user->get_id(), 'feed' => $feed->getId()));
 
         if (null === $token || true === $renew) {
             if (null === $token) {
diff --git a/lib/Doctrine/Repositories/FeedTokenRepository.php b/lib/Doctrine/Repositories/FeedTokenRepository.php
index 15ec6bb37c..f3b3df1630 100644
--- a/lib/Doctrine/Repositories/FeedTokenRepository.php
+++ b/lib/Doctrine/Repositories/FeedTokenRepository.php
@@ -23,27 +23,4 @@ use Entities\FeedToken;
  */
 class FeedTokenRepository extends EntityRepository
 {
-    /**
-     * Finds a FeedToken based on given Feed and User_Adapter.
-     *
-     * @param Feed          $feed
-     * @param \User_Adapter $user
-     *
-     * @return FeedToken
-     */
-    public function findByFeedAndUser(Feed $feed, \User_Adapter $user)
-    {
-        $dql = 'SELECT t
-            FROM Entities\FeedToken t
-            WHERE t.feed = :feed
-            AND t.usr_id = :usr_id';
-
-        $query = $this->_em->createQuery($dql);
-        $query->setParameters(array(
-            ':feed' => $feed,
-            ':usr_id' => $user->get_id())
-        );
-
-        return $query->getOneOrNullResult();
-    }
 }