Looks like this issue was solved by https://hibernate.atlassian.net/browse/HHH-15902 . I tested your reproducer and I can confirm that this is fixed in Hibernate 6.1.7.Final.