diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java
index a2763d032..1e4760951 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java
@@ -573,7 +573,8 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 					return Flux.usingWhen(Mono.just(session), //
 							s -> ReactiveMongoTemplate.this.withSession(action, s), //
 							ClientSession::commitTransaction, //
-							ClientSession::abortTransaction) //
+							(sess, err) -> sess.abortTransaction(), //
+							ClientSession::commitTransaction) //
 							.doFinally(signalType -> doFinally.accept(session));
 				});
 			}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/DataBufferPublisherAdapter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/DataBufferPublisherAdapter.java
index fa279931b..dfeb1411d 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/DataBufferPublisherAdapter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/DataBufferPublisherAdapter.java
@@ -68,7 +68,7 @@ class DataBufferPublisherAdapter {
 					state.request(sink, n);
 				});
 			});
-		}, AsyncInputStream::close, AsyncInputStream::close, AsyncInputStream::close) //
+		}, AsyncInputStream::close, (it, err) -> it.close(), AsyncInputStream::close) //
 				.concatMap(Flux::just, 1);
 	}