diff --git a/src/cmd/go/internal/modfetch/fetch.go b/src/cmd/go/internal/modfetch/fetch.go
index cb8435ee1c..21d5f54688 100644
--- a/src/cmd/go/internal/modfetch/fetch.go
+++ b/src/cmd/go/internal/modfetch/fetch.go
@@ -332,7 +332,7 @@ func hashZip(mod module.Version, zipfile, ziphashfile string) (err error) {
 		return err
 	}
 	defer func() {
-		if closeErr := hf.Close(); err != nil {
+		if closeErr := hf.Close(); err == nil && closeErr != nil {
 			err = closeErr
 		}
 	}()