Yes, thanks, Steve Ebersole Please see my adapted version at https://github.com/hibernate/hibernate-orm/commit/ae986bca4a6589f5fab2ab8208211042294b7750 which exposes the issue.

It only occurs if the map key is an entity and not an embeddable or basic type, i.e. if another join is needed to fetch the columns from the key type's table.