diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf
index 59420be46..512d9e82c 100644
--- a/docker/nginx/default.conf
+++ b/docker/nginx/default.conf
@@ -21,8 +21,9 @@ http {
         client_max_body_size 0;
         client_header_buffer_size 1k;
         large_client_header_buffers 4 16k;
-        send_timeout 60s;
-        keepalive_timeout 65s;
+        send_timeout 600s;
+        keepalive_timeout 600s;
+        client_body_timeout 600s;
         tcp_nopush on;
         tcp_nodelay on;
 
@@ -97,6 +98,8 @@ http {
             # Backend api calls
             location /api {
                 proxy_pass http://wsgi_server;
+                proxy_request_buffering off;
+                proxy_buffering off;
             }
             location /ws {
                 proxy_pass http://wsgi_server;
diff --git a/frontend/src/services/api/rom.ts b/frontend/src/services/api/rom.ts
index 1b3ebf984..d69ee55d7 100644
--- a/frontend/src/services/api/rom.ts
+++ b/frontend/src/services/api/rom.ts
@@ -32,7 +32,7 @@ async function uploadRoms({
       api
         .post("/roms", formData, {
           headers: {
-            "Content-Type": "multipart/form-data; boundary=boundary",
+            "Content-Type": "multipart/form-data",
             "X-Upload-Platform": platformId.toString(),
             "X-Upload-Filename": file.name,
           },