diff --git a/src/Wallabag/CoreBundle/Command/GenerateUrlHashesCommand.php b/src/Wallabag/CoreBundle/Command/GenerateUrlHashesCommand.php
index 775b04138..8f2bff114 100644
--- a/src/Wallabag/CoreBundle/Command/GenerateUrlHashesCommand.php
+++ b/src/Wallabag/CoreBundle/Command/GenerateUrlHashesCommand.php
@@ -66,9 +66,7 @@ class GenerateUrlHashesCommand extends ContainerAwareCommand
 
         $i = 1;
         foreach ($entries as $entry) {
-            $entry->setHashedUrl(
-                UrlHasher::hashUrl($entry->getUrl())
-            );
+            $entry->setHashedUrl(UrlHasher::hashUrl($entry->getUrl()));
             $em->persist($entry);
 
             if (0 === ($i % 20)) {
@@ -87,7 +85,7 @@ class GenerateUrlHashesCommand extends ContainerAwareCommand
      *
      * @param string $username
      *
-     * @return \Wallabag\UserBundle\Entity\User
+     * @return User
      */
     private function getUser($username)
     {
diff --git a/src/Wallabag/CoreBundle/Helper/UrlHasher.php b/src/Wallabag/CoreBundle/Helper/UrlHasher.php
index e44f219a8..d123eaba3 100644
--- a/src/Wallabag/CoreBundle/Helper/UrlHasher.php
+++ b/src/Wallabag/CoreBundle/Helper/UrlHasher.php
@@ -7,16 +7,17 @@ namespace Wallabag\CoreBundle\Helper;
  */
 class UrlHasher
 {
-    /** @var string */
-    const ALGORITHM = 'sha1';
-
     /**
-     * @param string $url
+     * Hash the given url using the given algorithm.
+     * Hashed url are faster to be retrieved in the database than the real url.
      *
-     * @return string hashed $url
+     * @param string $url
+     * @param string $algorithm
+     *
+     * @return string
      */
-    public static function hashUrl(string $url)
+    public static function hashUrl(string $url, $algorithm = 'sha1')
     {
-        return hash(static::ALGORITHM, $url);
+        return hash($algorithm, urldecode($url));
     }
 }
diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
index 37fc1000f..7c4a05ede 100644
--- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
@@ -351,7 +351,8 @@ class EntryRepository extends EntityRepository
     {
         return $this->findByHashedUrlAndUserId(
             UrlHasher::hashUrl($url),
-            $userId);
+            $userId
+        );
     }
 
     /**