Would be awesome if you could check whether the following PR fixes your issue: https://github.com/hibernate/hibernate-orm/pull/3479