diff --git a/src/server.ts b/src/server.ts
index 2d71d16..f884b7e 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -40,7 +40,7 @@ export default async function start() {
   app.use(express.json());
 
   app.use(compression());
-  app.set("trust proxy", true);
+  app.set("trust proxy", config.TRUST_PROXY);
   app.set("etag", "strong");
 
   app.get("/ip", (request, response) => response.send(request.ip));
diff --git a/src/storage/S3.ts b/src/storage/S3.ts
index f09bb1d..3f11051 100644
--- a/src/storage/S3.ts
+++ b/src/storage/S3.ts
@@ -250,7 +250,10 @@ export default class S3Storage implements StorageBase {
           }
         },
       });
-      pipeline(data, toS3, () => {})
+      pipeline(data, toS3, (err) => {
+        if (err) reject(err);
+        else resolve();
+      })
         .on("finish", resolve)
         .on("error", reject);
     });