diff --git a/src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java b/src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java
index 261858d9..3cc48ba4 100644
--- a/src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java
+++ b/src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java
@@ -568,8 +568,8 @@ private <T> Mono<T> doInsert(T entity, SqlIdentifier tableName, OutboundRow outb
 		return this.databaseClient.sql(operation) //
 				.filter(statement -> statement.returnGeneratedValues())
 				.map(this.dataAccessStrategy.getConverter().populateIdIfNecessary(entity)) //
-				.first() //
-				.defaultIfEmpty(entity) //
+				.all() //
+				.last(entity)
 				.flatMap(saved -> maybeCallAfterSave(saved, outboundRow, tableName));
 	}