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 49d951c673..4d69b19171 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
@@ -3547,6 +3547,8 @@ public abstract class AbstractEntityPersister
 			final TableMappingBuilder tableMappingBuilder;
 
 			final TableMappingBuilder existing = tableBuilderMap.get( tableExpression );
+
+			final boolean inverseTable = isInverseTable( relativePosition );
 			if ( existing == null ) {
 				final Consumer<SelectableConsumer> selectableConsumerConsumer = tableKeyColumnVisitationSupplier.get();
 				final List<EntityTableMapping.KeyColumn> keyColumns = new ArrayList<>();
@@ -3577,7 +3579,7 @@ public abstract class AbstractEntityPersister
 						relativePosition,
 						new EntityTableMapping.KeyMapping( keyColumns, identifierMapping ),
 						!isIdentifierTable && isNullableTable( relativePosition ),
-						isInverseTable( relativePosition ),
+						inverseTable,
 						isIdentifierTable,
 						insertExpectations[ relativePosition ],
 						customInsertSql,
@@ -3599,7 +3601,9 @@ public abstract class AbstractEntityPersister
 				tableMappingBuilder = existing;
 			}
 
-			collectAttributesIndexesForTable( relativePosition, tableMappingBuilder.attributeIndexes::add );
+			if ( !inverseTable ) {
+				collectAttributesIndexesForTable( relativePosition, tableMappingBuilder.attributeIndexes::add );
+			}
 		} );
 
 		final EntityTableMapping[] list = new EntityTableMapping[tableBuilderMap.size()];