Hi Sönke reimer, can you check whether the latest build of Envers addresses the porblem? I have added two fixes regarding @IdClass in HHH-10667 Closed and HHH-12965 Open and I'd like to see whether that provides a full solution.