I have created a pull request https://github.com/hibernate/hibernate-orm/pull/921 which has a fix for the issue mentioned in the original bug report as I was also hitting this. It is triggered when the PreUpdate callback occurs. The error reported by Jens Hohmuth is related to merging and I think might be fixed by HHH-5255.