diff --git a/library/ZendAfi/Form/Configuration/SearchResult.php b/library/ZendAfi/Form/Configuration/SearchResult.php
index 98503bd944e92da72a7584593f73391c1da4afcb..1ababe3f211674434d0b6ec3b5ce05539b2f3d36 100644
--- a/library/ZendAfi/Form/Configuration/SearchResult.php
+++ b/library/ZendAfi/Form/Configuration/SearchResult.php
@@ -245,7 +245,8 @@ class ZendAfi_Form_Configuration_SearchResult extends ZendAfi_Form {
 
       ->addElement('checkbox',
                    'bookmarks_enabled',
-                   ['label' => $this->_('Afficher les favoris utilisateur')])
+                   ['label' => $this->_('Afficher les favoris utilisateur'),
+                    'title' => $this->_('Attention: nécessite l\'activation de la variable ENABLE_BOOKMARKABLE_LIBRARIES')])
 
       ->addCvsElement()
 
diff --git a/library/ZendAfi/View/Helper/Bookmarks.php b/library/ZendAfi/View/Helper/Bookmarks.php
index 8d07da3285f25ec361a87fc4ca965e7cb857bc1d..94766204af04fb326b4841077b5534e6bb9925d1 100644
--- a/library/ZendAfi/View/Helper/Bookmarks.php
+++ b/library/ZendAfi/View/Helper/Bookmarks.php
@@ -24,6 +24,9 @@ class ZendAfi_View_Helper_Bookmarks extends ZendAfi_View_Helper_BaseHelper {
   protected $_bookmarks, $_criteres;
 
   public function bookmarks($search_result) {
+    if (!Class_AdminVar::isModuleEnabled('ENABLE_BOOKMARKABLE_LIBRARIES'))
+      return '';
+
     $preferences = $search_result->getSettings();
     $bookmarks = $search_result->fetchFacetsAndTags($preferences)['bookmarks'];
     $criteres = $search_result->getCriteresRecherche();
diff --git a/tests/application/modules/opac/controllers/RechercheControllerTest.php b/tests/application/modules/opac/controllers/RechercheControllerTest.php
index d42a1f45c57a4631fbd0ce6af86892514a81f26a..46538e6be725856344795576e9da7191c38d5ce6 100644
--- a/tests/application/modules/opac/controllers/RechercheControllerTest.php
+++ b/tests/application/modules/opac/controllers/RechercheControllerTest.php
@@ -1273,6 +1273,30 @@ abstract class RechercheControllerSimpleActionTestCase extends RechercheControll
 
 
 
+class RechercheControllerWithBookmarkableLibrariesDisabledTest extends RechercheControllerNoticeTestCase {
+  public function setUp() {
+    parent::setUp();
+    Class_AdminVar::set('ENABLE_BOOKMARKABLE_LIBRARIES', 0);
+  }
+
+
+  /** @test */
+  public function librariesBookmarksShouldNotBePresent() {
+    $this->dispatch('/recherche/simple/expressionRecherche/pomme/',true);
+    $this->assertNotXPath('//div[contains(@class, "bookmarks_outer")]');
+  }
+
+
+  /** @test */
+  public function withNoSessionManageYourBookmarksShouldNotBePresent() {
+    ZendAfi_Auth::getInstance()->clearIdentity();
+    $this->dispatch('/recherche/simple/expressionRecherche/pomme/',true);
+    $this->assertNotXPathContentContains('//div//p', 'Vous devez être connecté pour gérer vos favoris');
+  }
+}
+
+
+
 class RechercheControllerSimpleActionWithDefaultConfigTest extends RechercheControllerSimpleActionTestCase {
   public function setUp() {
     parent::setUp();
@@ -2798,6 +2822,7 @@ class RechercheControllerSimpleActionWithCvsActivatedTest extends RechercheContr
     $this->assertXPathContentContains('//div[@class="conteneur_simple"]//div[contains(@class,"cvs_container")]//h1', 'CVS Ressources', $this->_response->getBody());
   }
 
+
   /** @test **/
   public function cvsBoiteClassShouldHavePosition1() {
     $this->assertXPath('//div[@class="conteneur_simple"]//div[@class="cvs_container position_1"]', $this->_response->getBody());