diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml
index 330411d1911c..0cfcaeba0883 100644
--- a/src/main/resources/config/application.yml
+++ b/src/main/resources/config/application.yml
@@ -163,7 +163,7 @@ spring:
             hibernate.generate_statistics: false
             hibernate.order_inserts: true
             hibernate.order_updates: true
-            hibernate.query.fail_on_pagination_over_collection_fetch: true  # prevents issues, see https://vladmihalcea.com/hibernate-query-fail-on-pagination-over-collection-fetch
+            hibernate.query.fail_on_pagination_over_collection_fetch: false  # prevents issues, see https://vladmihalcea.com/hibernate-query-fail-on-pagination-over-collection-fetch
             hibernate.query.in_clause_parameter_padding: true
             hibernate.cache.use_second_level_cache: true
             hibernate.cache.use_query_cache: false
diff --git a/src/test/resources/config/application.yml b/src/test/resources/config/application.yml
index 20d18f870ab0..843ab4a8cc43 100644
--- a/src/test/resources/config/application.yml
+++ b/src/test/resources/config/application.yml
@@ -109,7 +109,7 @@ spring:
             hibernate.generate_statistics: false
             hibernate.order_inserts: true
             hibernate.order_updates: true
-            hibernate.query.fail_on_pagination_over_collection_fetch: true  # prevents issues, see https://vladmihalcea.com/hibernate-query-fail-on-pagination-over-collection-fetch
+            hibernate.query.fail_on_pagination_over_collection_fetch: false  # prevents issues, see https://vladmihalcea.com/hibernate-query-fail-on-pagination-over-collection-fetch
             hibernate.query.in_clause_parameter_padding: true
             hibernate.cache.use_second_level_cache: true
             hibernate.cache.use_query_cache: false