diff --git a/OpenChange/MAPIStoreMapping.m b/OpenChange/MAPIStoreMapping.m
index 194488bc7..516f1a079 100644
--- a/OpenChange/MAPIStoreMapping.m
+++ b/OpenChange/MAPIStoreMapping.m
@@ -114,6 +114,9 @@ MAPIStoreMappingKeyFromId (uint64_t idNbr)
     {
       ASSIGN (username, newUsername);
       indexing = newIndexing;
+      /* Workaround so all indexing context are valid and won't be freed. */
+      // TODO refactor indexing interface
+      talloc_reference(memCtx, indexing);
     }
 
   return self;