diff --git a/dspace-api/src/main/java/org/dspace/core/Context.java b/dspace-api/src/main/java/org/dspace/core/Context.java
index 6382e72430..09b9c4a32d 100644
--- a/dspace-api/src/main/java/org/dspace/core/Context.java
+++ b/dspace-api/src/main/java/org/dspace/core/Context.java
@@ -810,6 +810,15 @@ public class Context implements AutoCloseable {
             readOnlyCache.clear();
         }
 
+        // When going to READ_ONLY, flush database changes to ensure that the current data is retrieved
+        if (newMode == Mode.READ_ONLY && mode != Mode.READ_ONLY) {
+            try {
+                dbConnection.flushSession();
+            } catch (SQLException ex) {
+                log.warn("Unable to flush database changes after switching to READ_ONLY mode", ex);
+            }
+        }
+
         //save the new mode
         mode = newMode;
     }
@@ -880,16 +889,6 @@ public class Context implements AutoCloseable {
         dbConnection.uncacheEntity(entity);
     }
 
-    /**
-     * Flush the current Session to synchronizes the in-memory state of the Session
-     * with the database (write changes to the database)
-     *
-     * @throws SQLException passed through.
-     */
-    public void flushDBChanges() throws SQLException {
-        dbConnection.flushSession();
-    }
-
     public Boolean getCachedAuthorizationResult(DSpaceObject dspaceObject, int action, EPerson eperson) {
         if (isReadOnly()) {
             return readOnlyCache.getCachedAuthorizationResult(dspaceObject, action, eperson);
diff --git a/dspace-api/src/main/java/org/dspace/discovery/IndexEventConsumer.java b/dspace-api/src/main/java/org/dspace/discovery/IndexEventConsumer.java
index fd255e9ffc..847e235fa9 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/IndexEventConsumer.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/IndexEventConsumer.java
@@ -202,10 +202,6 @@ public class IndexEventConsumer implements Consumer {
     public void end(Context ctx) throws Exception {
 
         // Change the mode to readonly to improve performance
-        // First, we flush the changes to database, if session is dirty, has pending changes
-        // to synchronize with database, without this flush it could index an old version of
-        // the object
-        ctx.flushDBChanges();
         Context.Mode originalMode = ctx.getCurrentMode();
         ctx.setMode(Context.Mode.READ_ONLY);