diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f90606c14..66fd3a056 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -13,6 +13,7 @@ spring:
     timeout-per-shutdown-phase: 5s
   servlet:
     multipart:
+      resolve-lazily: true
       max-request-size: 10MB
       max-file-size: 10MB
 
diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
index 5e31a3e67..f4b0ae695 100644
--- a/src/test/resources/application.yml
+++ b/src/test/resources/application.yml
@@ -23,6 +23,7 @@ spring:
     suffix: ".html"
   servlet:
     multipart:
+      resolve-lazily: true
       max-file-size: 10MB
       max-request-size: 10MB
   autoconfigure: