diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
index ec01e6b802..50c00f2a38 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
@@ -4697,7 +4697,7 @@ public abstract class AbstractEntityPersister
 		for ( AttributeMapping generatedAttribute : generatedAttributes ) {
 			// todo (7.0) : support non selectable mappings? Component, ToOneAttributeMapping, ...
 			if ( generatedAttribute.asBasicValuedModelPart() != null
-					&& generatedAttribute.getContainingTableExpression().equals( getSubclassTableName( 0 ) ) ) {
+					&& generatedAttribute.getContainingTableExpression().equals( getRootTableName() ) ) {
 				generatedBasicAttributes.add( generatedAttribute );
 			}
 		}