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 8b460f5..aa6c5b3 100644
--- a/src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java
+++ b/src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java
@@ -409,7 +409,7 @@ public class R2dbcEntityTemplate implements R2dbcEntityOperations, BeanFactoryAw
 			return (P) ((Mono<?>) result).flatMap(it -> maybeCallAfterConvert(it, tableName));
 		}
 
-		return (P) ((Flux<?>) result).flatMap(it -> maybeCallAfterConvert(it, tableName));
+		return (P) ((Flux<?>) result).concatMap(it -> maybeCallAfterConvert(it, tableName));
 	}
 
 	private <T> RowsFetchSpec<T> doSelect(Query query, Class<?> entityClass, SqlIdentifier tableName,
@@ -1114,7 +1114,7 @@ public class R2dbcEntityTemplate implements R2dbcEntityOperations, BeanFactoryAw
 
 		@Override
 		public Flux<T> all() {
-			return delegate.all().flatMap(it -> maybeCallAfterConvert(it, tableName));
+			return delegate.all().concatMap(it -> maybeCallAfterConvert(it, tableName));
 		}
 	}