diff --git a/docs-core/src/main/java/com/sismics/docs/core/listener/async/DocumentCreatedAsyncListener.java b/docs-core/src/main/java/com/sismics/docs/core/listener/async/DocumentCreatedAsyncListener.java
index e5cc1341..13cb762b 100644
--- a/docs-core/src/main/java/com/sismics/docs/core/listener/async/DocumentCreatedAsyncListener.java
+++ b/docs-core/src/main/java/com/sismics/docs/core/listener/async/DocumentCreatedAsyncListener.java
@@ -38,9 +38,9 @@ public class DocumentCreatedAsyncListener {
             contributor.setDocumentId(event.getDocument().getId());
             contributor.setUserId(event.getUserId());
             contributorDao.create(contributor);
+
+            // Update Lucene index
+            AppContext.getInstance().getIndexingHandler().createDocument(event.getDocument());
         });
-        
-        // Update Lucene index
-        AppContext.getInstance().getIndexingHandler().createDocument(event.getDocument());
     }
 }
diff --git a/docs-core/src/main/java/com/sismics/docs/core/listener/async/DocumentUpdatedAsyncListener.java b/docs-core/src/main/java/com/sismics/docs/core/listener/async/DocumentUpdatedAsyncListener.java
index 3e114ead..f813616f 100644
--- a/docs-core/src/main/java/com/sismics/docs/core/listener/async/DocumentUpdatedAsyncListener.java
+++ b/docs-core/src/main/java/com/sismics/docs/core/listener/async/DocumentUpdatedAsyncListener.java
@@ -36,7 +36,7 @@ public class DocumentUpdatedAsyncListener {
         }
 
         TransactionUtil.handle(() -> {
-            // Update Lucene index
+            // Update index
             DocumentDao documentDao = new DocumentDao();
             Document document = documentDao.getById(event.getDocumentId());
             if (document == null) {