diff --git a/src/main/java/org/springframework/data/mapping/model/AbstractPersistentProperty.java b/src/main/java/org/springframework/data/mapping/model/AbstractPersistentProperty.java
index 7ccdff4a5..c8af5bd5a 100644
--- a/src/main/java/org/springframework/data/mapping/model/AbstractPersistentProperty.java
+++ b/src/main/java/org/springframework/data/mapping/model/AbstractPersistentProperty.java
@@ -157,15 +157,6 @@ public abstract class AbstractPersistentProperty<P extends PersistentProperty<P>
 
 	@Override
 	public Iterable<? extends TypeInformation<?>> getPersistentEntityTypeInformation() {
-
-		if (isMap() || isCollectionLike()) {
-			return entityTypeInformation.get();
-		}
-
-		if (!isEntity()) {
-			return Collections.emptySet();
-		}
-
 		return entityTypeInformation.get();
 	}
 
@@ -292,6 +283,7 @@ public abstract class AbstractPersistentProperty<P extends PersistentProperty<P>
 		return getActualTypeInformation().getType();
 	}
 
+	@Override
 	public boolean usePropertyAccess() {
 		return usePropertyAccess.get();
 	}