diff --git a/transcoder/src/storage/s3storage.go b/transcoder/src/storage/s3storage.go
index f441fea4..5e7628b4 100644
--- a/transcoder/src/storage/s3storage.go
+++ b/transcoder/src/storage/s3storage.go
@@ -166,7 +166,6 @@ func (ssb *S3StorageBackend) DeleteItemsWithPrefix(ctx context.Context, pathPref
 func (ssb *S3StorageBackend) SaveItemWithCallback(ctx context.Context, path string, writeContents ContentsWriterCallback) (err error) {
 	// Create a pipe to connect the writer and reader.
 	pr, pw := io.Pipe()
-	defer utils.CleanupWithErr(&err, pr.Close, "failed to close pipe reader")
 
 	// Start a goroutine to write to the pipe.
 	// Writing and reading must occur concurrently to avoid deadlocks.
@@ -174,7 +173,6 @@ func (ssb *S3StorageBackend) SaveItemWithCallback(ctx context.Context, path stri
 	// Use a separate context for the writer to allow cancellation if the upload fails. This is important to avoid
 	// a hung goroutine leak if the upload fails.
 	writeCtx, cancel := context.WithCancel(ctx)
-	defer cancel()
 
 	var writerGroup errgroup.Group
 	writerGroup.Go(func() (err error) {
@@ -182,16 +180,20 @@ func (ssb *S3StorageBackend) SaveItemWithCallback(ctx context.Context, path stri
 		return writeContents(writeCtx, pw)
 	})
 
+	// Handle cleanup and avoid a goroutines leak.
+	// Order is critical here. If the context is not cancelled, or the pipe is not closed
+	// before waiting for the writer to finish, there can be a deadlock. This happens when
+	// a writer without context support is waiting for written bytes to be read.
+	// Remember: the last deferred function is executed first.
 	// Wait for the write to complete and check for errors.
 	// This should always happen even if saving fails, to prevent a goroutine leak.
 	defer utils.CleanupWithErr(&err, writerGroup.Wait, "writer callback failed")
+	defer utils.CleanupWithErr(&err, pr.Close, "failed to close pipe reader")
+	defer cancel()
 
 	// Upload the object to S3 using the pipe as the body.
 	if err := ssb.SaveItem(ctx, path, pr); err != nil {
-		// Ensure that the writer context is cancelled prior to awaiting for the writer to finish.
-		// This is important to avoid a hung goroutine leak if the upload fails.
-		cancel()
-		return err
+		return fmt.Errorf("failed to save item with path %q: %w", path, err)
 	}
 
 	return nil