This issue is very similar to https://hibernate.atlassian.net/browse/HHH-16363, after a quick test I confirmed that my PR for that issue also fixes the provided reproducer for this.