You can disable the subquery rewriting behavior in 5.2.4 now with the property hibernate.collection_join_subquery. Also see https://docs.jboss.org/hibernate/orm/current/userguide/html_single/Hibernate_User_Guide.html#configurations-misc

Could you maybe also share the entity model so I can understand what is happening there?