diff --git a/src/main/java/org/springframework/data/r2dbc/function/convert/EntityRowMapper.java b/src/main/java/org/springframework/data/r2dbc/function/convert/EntityRowMapper.java
index c1c67b26..33cffd8f 100644
--- a/src/main/java/org/springframework/data/r2dbc/function/convert/EntityRowMapper.java
+++ b/src/main/java/org/springframework/data/r2dbc/function/convert/EntityRowMapper.java
@@ -66,10 +66,7 @@ public T apply(Row row, RowMetadata metadata) {
 				continue;
 			}
 
-			if (property.isCollectionLike()) {
-				throw new UnsupportedOperationException();
-			} else if (property.isMap()) {
-
+			if (property.isMap()) {
 				throw new UnsupportedOperationException();
 			} else {
 				propertyAccessor.setProperty(property, readFrom(row, property, ""));