This was fixed with this commit: https://github.com/hibernate/hibernate-orm/commit/4ceb71f08a1a5fd71d6df6c47aeaa7547755bfdf