diff --git a/src/main/java/it/cavallium/dbengine/database/LLLuceneIndex.java b/src/main/java/it/cavallium/dbengine/database/LLLuceneIndex.java
index 0293e11..0155715 100644
--- a/src/main/java/it/cavallium/dbengine/database/LLLuceneIndex.java
+++ b/src/main/java/it/cavallium/dbengine/database/LLLuceneIndex.java
@@ -85,7 +85,8 @@ public interface LLLuceneIndex extends LLSnapshottable {
 	Mono<Void> close();
 
 	/**
-	 * Flush writes to disk
+	 * Flush writes to disk.
+	 * This does not commit, it syncs the data to the disk
 	 */
 	Mono<Void> flush();
 
diff --git a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalLuceneIndex.java b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalLuceneIndex.java
index 84fe7cc..c2db07d 100644
--- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalLuceneIndex.java
+++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalLuceneIndex.java
@@ -54,9 +54,11 @@ import org.apache.lucene.index.ConcurrentMergeScheduler;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.IndexWriterConfig;
 import org.apache.lucene.index.KeepOnlyLastCommitDeletionPolicy;
+import org.apache.lucene.index.MergePolicy;
 import org.apache.lucene.index.MergeScheduler;
 import org.apache.lucene.index.SerialMergeScheduler;
 import org.apache.lucene.index.SnapshotDeletionPolicy;
+import org.apache.lucene.index.TieredMergePolicy;
 import org.apache.lucene.misc.store.DirectIODirectory;
 import org.apache.lucene.search.similarities.Similarity;
 import org.apache.lucene.store.ByteBuffersDirectory;
@@ -465,7 +467,7 @@ public class LLLocalLuceneIndex implements LLLuceneIndex {
 				.<Void>fromCallable(() -> {
 					if (activeTasks.isTerminated()) return null;
 					//noinspection BlockingMethodInNonBlockingContext
-					indexWriter.commit();
+					indexWriter.flush();
 					return null;
 				})
 				.subscribeOn(luceneHeavyTasksScheduler)
@@ -496,9 +498,7 @@ public class LLLocalLuceneIndex implements LLLuceneIndex {
 
 	private void scheduledCommit() {
 		try {
-			if (indexWriter.hasUncommittedChanges()) {
-				indexWriter.commit();
-			}
+			indexWriter.commit();
 		} catch (IOException ex) {
 			logger.error(MARKER_LUCENE, "Failed to execute a scheduled commit", ex);
 		}