diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java
index 6500dbfd61..0ce5af0b18 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java
@@ -849,6 +849,9 @@ public class PluralAttributeMappingImpl extends AbstractAttributeMapping impleme
 		if ( elementDescriptor instanceof EntityCollectionPart ) {
 			return ( (EntityCollectionPart) elementDescriptor ).findSubPart( name );
 		}
+		else if ( elementDescriptor instanceof EmbeddedCollectionPart ) {
+			return ( (EmbeddedCollectionPart) elementDescriptor ).findSubPart( name, treatTargetType );
+		}
 		return null;
 	}