MartinM, I suspect your issue is related to or a duplicate of HHH-9370 Resolved .

We still need a test case to reproduce your issue. You can find test templates at https://github.com/hibernate/hibernate-test-case-templates.