Whatever fix you design may also address HHH-11416 Open . I have pushed PR (https://github.com/hibernate/hibernate-orm/pull/1770) that contains a test case that outlines the failure both from the Envers perspective and Hibernate proper. Once you have a fix, feel free to ping me or check my test case so I know whether we need to do anything else for HHH-11416 Open for 5.2.8.