diff --git a/src/common/kiwix/indexer.cpp b/src/common/kiwix/indexer.cpp
index 9cc5ce392..935cbe334 100644
--- a/src/common/kiwix/indexer.cpp
+++ b/src/common/kiwix/indexer.cpp
@@ -230,7 +230,6 @@ namespace kiwix {
       /* Test if the thread should be cancelled */
       pthread_testcancel();
     }
-    self->setProgression(100);
     self->indexingPostlude();
 #ifdef _WIN32
     Sleep(100);
@@ -238,6 +237,7 @@ namespace kiwix {
     sleep(1);
 #endif
     self->articleIndexerRunning(false);
+    self->setProgression(100);
     pthread_exit(NULL);
     return NULL;
   }
diff --git a/src/common/kiwix/xapianIndexer.cpp b/src/common/kiwix/xapianIndexer.cpp
index 85acdb4e6..bbf18ae71 100644
--- a/src/common/kiwix/xapianIndexer.cpp
+++ b/src/common/kiwix/xapianIndexer.cpp
@@ -92,7 +92,10 @@ namespace kiwix {
   void XapianIndexer::indexingPostlude() {
     this->flush();
     this->writableDatabase.commit_transaction();
-    this->writableDatabase.close();
+    #ifdef __APPLE__
+    #else
+      this->writableDatabase.close();
+    #endif
 
     // commit is not available is old version of xapian and seems not mandatory there
     // this->writableDatabase.commit();