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 8de49ba..cd47f73 100644
--- a/src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java
+++ b/src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java
@@ -392,8 +392,7 @@ public class R2dbcEntityTemplate implements R2dbcEntityOperations, BeanFactoryAw
 				.into(persistentEntity.getType()) //
 				.table(tableName).using(entityToInsert) //
 				.map(this.dataAccessStrategy.getConverter().populateIdIfNecessary(entityToInsert)) //
-				.first() //
-				.defaultIfEmpty(entityToInsert);
+				.all().last(entityToInsert); //
 	}
 
 	@SuppressWarnings("unchecked")