This seems to be fixed already via the PR for https://hibernate.atlassian.net/browse/HHH-12297 Can you verify that is the case? Thanks