@Jan-Willem Gmelig Meyling I am totally open to the possibility that our mapping is wrong. @OneToOne in combination with @PrimaryKeyJoinColumn has some pitfalls. I am just saying that something that has worked since forever is now broken. Of course, it may be that this also has been wrong forever