diff --git a/codex/download.go b/codex/download.go
index 8b67b55..debe0d3 100644
--- a/codex/download.go
+++ b/codex/download.go
@@ -239,7 +239,7 @@ func (node CodexNode) DownloadStream(ctx context.Context, cid string, options Do
 		return err
 	}
 
-	return nil
+	return cancelError
 }
 
 // DownloadInit initializes the download process for a specific CID.
diff --git a/codex/upload.go b/codex/upload.go
index 0643d87..56455b5 100644
--- a/codex/upload.go
+++ b/codex/upload.go
@@ -333,7 +333,7 @@ func (node CodexNode) UploadFile(ctx context.Context, options UploadOptions) (st
 		return "", err
 	}
 
-	return bridge.result, nil
+	return bridge.result, cancelErr
 }
 
 // UploadFileAsync is the asynchronous version of UploadFile using a goroutine.