diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 278ad980e..067e44af0 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -20,6 +20,7 @@ spring:
       - optional:file:.env.${spring.profiles.active}[.properties]
   servlet:
     multipart:
+      resolve-lazily: true
       max-file-size: 20MB
       max-request-size: 20MB
 
diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
index f9311bdb4..ed867b4b8 100644
--- a/src/test/resources/application.yml
+++ b/src/test/resources/application.yml
@@ -4,6 +4,7 @@ spring:
 
   servlet:
     multipart:
+      resolve-lazily: true
       max-file-size: 20MB
       max-request-size: 20MB