diff --git a/server/src/main/helm/templates/deployment.yaml b/server/src/main/helm/templates/deployment.yaml
index f70d00df638dc54df685ac47cc30a0bee74046d1..ca326aa2039978760ed215c82dd2512464be2db6 100644
--- a/server/src/main/helm/templates/deployment.yaml
+++ b/server/src/main/helm/templates/deployment.yaml
@@ -125,6 +125,8 @@ spec:
           value: {{.Values.antragsraum.servlet.maxFileSize }}
         - name: SPRING_SERVLET_MULTIPART_MAX-REQUEST-SIZE
           value: {{.Values.antragsraum.servlet.maxRequestSize }}
+        - name: SERVER_TOMCAT_MAX-SWALLOW-SIZE
+          value: {{((.Values.antragsraum).tomcat).maxSwallowSize }}
 
         - name: OZGCLOUD_JWT_SECRET
           valueFrom:
diff --git a/server/src/main/helm/values.yaml b/server/src/main/helm/values.yaml
index ddea7310a55a48d50ade5c970e73a0d46acdb0e3..23d4e2ab7fcaffadbd30ee119deef37d79862846 100644
--- a/server/src/main/helm/values.yaml
+++ b/server/src/main/helm/values.yaml
@@ -36,3 +36,5 @@ antragsraum:
   servlet:
     maxRequestSize: 50MB
     maxFileSize: 30MB
+  tomcat:
+    maxSwallowSize: -1
diff --git a/server/src/test/helm/deployment_env_test.yaml b/server/src/test/helm/deployment_env_test.yaml
index d53e5e80f52e9a26ab9970466cab569d41f0d1af..3849f0508a08c26b8fd1768224cb571678db1c6f 100644
--- a/server/src/test/helm/deployment_env_test.yaml
+++ b/server/src/test/helm/deployment_env_test.yaml
@@ -206,12 +206,19 @@ tests:
           content: 
             name: SPRING_SERVLET_MULTIPART_MAX-REQUEST-SIZE
             value: 50MB
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content: 
+            name: SERVER_TOMCAT_MAX-SWALLOW-SIZE
+            value: -1
   - it: should set spring servlet envs 
     set: 
       antragsraum:
         servlet:
           maxRequestSize: 40MB
           maxFileSize: 35MB
+        tomcat:
+          maxSwallowSize: 50MB
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
@@ -222,4 +229,9 @@ tests:
           path: spec.template.spec.containers[0].env
           content: 
             name: SPRING_SERVLET_MULTIPART_MAX-REQUEST-SIZE
-            value: 40MB
\ No newline at end of file
+            value: 40MB
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content: 
+            name: SERVER_TOMCAT_MAX-SWALLOW-SIZE
+            value: 50MB
\ No newline at end of file