diff --git a/app/api/entities/routes.js b/app/api/entities/routes.js
index 0a8f35b14b..fb005cb472 100644
--- a/app/api/entities/routes.js
+++ b/app/api/entities/routes.js
@@ -5,7 +5,7 @@ import { search } from 'api/search';
 import { withTransaction } from 'api/utils/withTransaction';
 import needsAuthorization from '../auth/authMiddleware';
 import templates from '../templates/templates';
-import thesauri from '../thesauri/thesauri';
+import { thesauri } from '../thesauri/thesauri';
 import { parseQuery, validation } from '../utils';
 import date from '../utils/date';
 import entities from './entities';
@@ -81,7 +81,7 @@ export default app => {
     activitylogMiddleware,
     async (req, res, next) => {
       try {
-        await withTransaction(async () => {
+        await withTransaction(async ({ abort }) => {
           const entityToSave = req.body.entity ? JSON.parse(req.body.entity) : req.body;
           const result = await saveEntity(entityToSave, {
             user: req.user,
@@ -92,7 +92,7 @@ export default app => {
           const { entity, errors } = result;
           await updateThesauriWithEntity(entity, req);
           if (errors.length) {
-            console.log(errors);
+            await abort();
           }
           res.json(req.body.entity ? result : entity);
         });
diff --git a/app/api/odm/sessionsContext.ts b/app/api/odm/sessionsContext.ts
index fa74e4b845..d3d2dbf427 100644
--- a/app/api/odm/sessionsContext.ts
+++ b/app/api/odm/sessionsContext.ts
@@ -8,10 +8,22 @@ export const dbSessionContext = {
     return appContext.get('mongoSession') as ClientSession | undefined;
   },
 
+  getReindexOperations() {
+    return (
+      (appContext.get('reindexOperations') as [query?: any, select?: string, limit?: number][]) ||
+      []
+    );
+  },
+
   clearSession() {
     appContext.set('mongoSession', undefined);
   },
 
+  clearContext() {
+    appContext.set('mongoSession', undefined);
+    appContext.set('reindexOperations', undefined);
+  },
+
   async startSession() {
     const currentTenant = tenants.current();
     const connection = DB.connectionForDB(currentTenant.dbName);
@@ -19,4 +31,10 @@ export const dbSessionContext = {
     appContext.set('mongoSession', session);
     return session;
   },
+
+  registerESIndexOperation(args: [query?: any, select?: string, limit?: number]) {
+    const reindexOperations = dbSessionContext.getReindexOperations();
+    reindexOperations.push(args);
+    appContext.set('reindexOperations', reindexOperations);
+  },
 };
diff --git a/app/api/utils/specs/withTransaction.spec.ts b/app/api/utils/specs/withTransaction.spec.ts
index 2b5faaa57e..6b82d33eca 100644
--- a/app/api/utils/specs/withTransaction.spec.ts
+++ b/app/api/utils/specs/withTransaction.spec.ts
@@ -1,16 +1,38 @@
-import { instanceModel } from 'api/odm/model';
-import { dbSessionContext } from 'api/odm/sessionsContext';
-import { testingEnvironment } from 'api/utils/testingEnvironment';
-import { withTransaction } from 'api/utils/withTransaction';
 import { ClientSession } from 'mongodb';
 import { Schema } from 'mongoose';
+
+import entities from 'api/entities';
+import { instanceModel } from 'api/odm/model';
+import { dbSessionContext } from 'api/odm/sessionsContext';
+
 import { appContext } from '../AppContext';
+import { elasticTesting } from '../elastic_testing';
+import { getFixturesFactory } from '../fixturesFactory';
+import { testingEnvironment } from '../testingEnvironment';
+import { withTransaction } from '../withTransaction';
+import { EntitySchema } from 'shared/types/entityType';
+
+const factory = getFixturesFactory();
 
 interface TestDoc {
   title: string;
   value?: number;
 }
 
+afterAll(async () => {
+  await testingEnvironment.tearDown();
+});
+
+const saveEntity = async (entity: EntitySchema) =>
+  entities.save(entity, { user: {}, language: 'es' }, { updateRelationships: false });
+
+const createEntity = async (entity: EntitySchema) =>
+  entities.save(
+    { ...entity, _id: undefined, sharedId: undefined },
+    { user: {}, language: 'es' },
+    { updateRelationships: false }
+  );
+
 describe('withTransaction utility', () => {
   let model: any;
 
@@ -27,10 +49,6 @@ describe('withTransaction utility', () => {
     testingEnvironment.unsetFakeContext();
   });
 
-  afterAll(async () => {
-    await testingEnvironment.tearDown();
-  });
-
   it('should commit transaction when operation succeeds', async () => {
     await appContext.run(async () => {
       await withTransaction(async () => {
@@ -212,3 +230,84 @@ describe('withTransaction utility', () => {
     });
   });
 });
+
+describe('Entities elasticsearch index', () => { beforeEach(async () => {
+    await testingEnvironment.setUp(
+      {
+        transactiontests: [],
+        templates: [factory.template('template1')],
+        entities: [
+          factory.entity('existing1', 'template1'),
+          factory.entity('existing2', 'template1'),
+        ],
+        settings: [{ languages: [{ label: 'English', key: 'en', default: true }] }],
+      },
+      'with_transaction_index'
+    );
+    testingEnvironment.unsetFakeContext();
+  });
+
+  it('should handle delayed reindexing after a successful transaction', async () => {
+    await appContext.run(async () => {
+      await withTransaction(async () => {
+        await entities.save(
+          { ...factory.entity('test1', 'template1'), _id: undefined, sharedId: undefined },
+          { user: {}, language: 'es' },
+          { updateRelationships: false }
+        );
+        await entities.save(
+          { ...factory.entity('test2', 'template1'), _id: undefined, sharedId: undefined },
+          { user: {}, language: 'es' },
+          { updateRelationships: false }
+        );
+      });
+
+      await elasticTesting.refresh();
+      const indexedEntities = await elasticTesting.getIndexedEntities();
+      expect(indexedEntities).toHaveLength(4);
+      expect(indexedEntities).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ title: 'test1' }),
+          expect.objectContaining({ title: 'test2' }),
+          expect.objectContaining({ title: 'existing1' }),
+          expect.objectContaining({ title: 'existing2' }),
+        ])
+      );
+    });
+  });
+
+  it('should not index changes to elasticsearch if transaction is aborted manually', async () => {
+    await appContext.run(async () => {
+      await withTransaction(async ({ abort }) => {
+        await saveEntity({ ...factory.entity('existing1', 'template1'), title: 'update1' });
+        await saveEntity({ ...factory.entity('existing2', 'template1'), title: 'update2' });
+        await createEntity(factory.entity('new', 'template1'));
+        await abort();
+      });
+
+      const indexedEntities = await elasticTesting.getIndexedEntities();
+      expect(indexedEntities).toMatchObject([{ title: 'existing1' }, { title: 'existing2' }]);
+    });
+  });
+
+  it('should not index changes to elasticsearch if transaction is aborted by an error', async () => {
+    await appContext.run(async () => {
+      let error;
+      try {
+        await withTransaction(async () => {
+          await saveEntity({ ...factory.entity('existing1', 'template1'), title: 'update1' });
+          await saveEntity({ ...factory.entity('existing2', 'template1'), title: 'update2' });
+          await createEntity(factory.entity('new', 'template1'));
+          throw new Error('Testing error');
+        });
+      } catch (e) {
+        error = e;
+      }
+
+      expect(error.message).toBe('Testing error');
+
+      const indexedEntities = await elasticTesting.getIndexedEntities();
+      expect(indexedEntities).toMatchObject([{ title: 'existing1' }, { title: 'existing2' }]);
+    });
+  });
+});
diff --git a/app/api/utils/testing_db.ts b/app/api/utils/testing_db.ts
index 6281865912..f6a27484b0 100644
--- a/app/api/utils/testing_db.ts
+++ b/app/api/utils/testing_db.ts
@@ -126,6 +126,7 @@ const testingDB: {
 
   async tearDown() {
     await this.disconnect();
+    connected = false;
   },
 
   async disconnect() {
diff --git a/app/api/utils/withTransaction.ts b/app/api/utils/withTransaction.ts
index d4235876f6..58c9a41e0e 100644
--- a/app/api/utils/withTransaction.ts
+++ b/app/api/utils/withTransaction.ts
@@ -1,9 +1,26 @@
 import { dbSessionContext } from 'api/odm/sessionsContext';
+import { search } from 'api/search';
 
 interface TransactionOperation {
   abort: () => Promise<void>;
 }
 
+const originalIndexEntities = search.indexEntities.bind(search);
+search.indexEntities = async (query, select, limit) => {
+  if (dbSessionContext.getSession()) {
+    return dbSessionContext.registerESIndexOperation([query, select, limit]);
+  }
+  return originalIndexEntities(query, select, limit);
+};
+
+const performDelayedReindexes = async () => {
+  await Promise.all(
+    dbSessionContext
+      .getReindexOperations()
+      .map(async reindexArgs => originalIndexEntities(...reindexArgs))
+  );
+};
+
 const withTransaction = async <T>(
   operation: (context: TransactionOperation) => Promise<T>
 ): Promise<T> => {
@@ -24,6 +41,8 @@ const withTransaction = async <T>(
     const result = await operation(context);
     if (!wasManuallyAborted) {
       await session.commitTransaction();
+      dbSessionContext.clearSession();
+      await performDelayedReindexes();
     }
     return result;
   } catch (e) {