diff --git a/backend/services/chunk-service/actions/S3-actions.ts b/backend/services/chunk-service/actions/S3-actions.ts
index e959725..4d3465a 100644
--- a/backend/services/chunk-service/actions/S3-actions.ts
+++ b/backend/services/chunk-service/actions/S3-actions.ts
@@ -78,7 +78,8 @@ class S3Actions implements IStorageActions {
       { Bucket: bucket, Body: passThrough, Key: randomID },
       (err) => {
         if (err) {
-          console.log("S3 upload err", err);
+          emitter.emit("error", err);
+          return;
         }
         emitter.emit("finish");
       }
diff --git a/backend/services/chunk-service/utils/getBusboyData.ts b/backend/services/chunk-service/utils/getBusboyData.ts
index e70aff8..e938faf 100644
--- a/backend/services/chunk-service/utils/getBusboyData.ts
+++ b/backend/services/chunk-service/utils/getBusboyData.ts
@@ -134,17 +134,20 @@ const processData = (
             reject(e);
           });
 
-          cipher.pipe(writeStream);
-
           if (emitter) {
             emitter.on("finish", () => {
               resolve({ filename, metadata });
             });
+            emitter.on("error", (e: Error) => {
+              reject(e);
+            });
           } else {
             writeStream.on("finish", () => {
               resolve({ filename, metadata });
             });
           }
+
+          cipher.pipe(writeStream);
         }
       );
     };