diff --git a/src/plugins/fts/fts-storage.c b/src/plugins/fts/fts-storage.c
index 37229c5f46..e42600f5a5 100644
--- a/src/plugins/fts/fts-storage.c
+++ b/src/plugins/fts/fts-storage.c
@@ -645,8 +645,11 @@ fts_transaction_commit(struct mailbox_transaction_context *t,
 	if (ret < 0)
 		return -1;
 
-	if (autoindex)
-		fts_queue_index(box);
+	if (autoindex) {
+		T_BEGIN {
+			fts_queue_index(box);
+		} T_END;
+	}
 	return 0;
 }