diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java
index 4b98dfce48..45c97d3d65 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java
@@ -1105,7 +1105,7 @@ public class ActionQueue {
 				for ( int j = i - 1; j >= 0; j-- ) {
 					BatchIdentifier prevBatchIdentifier = latestBatches.get( j );
 					if(prevBatchIdentifier.getParentEntityNames().contains( entityName )) {
-						latestBatches.remove( i );
+						latestBatches.remove( batchIdentifier );
 						latestBatches.add( j, batchIdentifier );
 					}
 				}
@@ -1116,7 +1116,7 @@ public class ActionQueue {
 					//Take care of unidirectional @OneToOne associations but exclude bidirectional @ManyToMany
 					if(nextBatchIdentifier.getChildEntityNames().contains( entityName ) &&
 						!batchIdentifier.getChildEntityNames().contains( nextBatchIdentifier.getEntityName() )) {
-						latestBatches.remove( i );
+						latestBatches.remove( batchIdentifier );
 						latestBatches.add( j, batchIdentifier );
 					}
 				}