diff --git a/cmd/object-handlers.go b/cmd/object-handlers.go
index 465ab8427..775a9f104 100644
--- a/cmd/object-handlers.go
+++ b/cmd/object-handlers.go
@@ -1092,6 +1092,7 @@ func (api objectAPIHandlers) CopyObjectHandler(w http.ResponseWriter, r *http.Re
 		compressMetadata[ReservedMetadataPrefix+"compression"] = compressionAlgorithmV2
 		compressMetadata[ReservedMetadataPrefix+"actual-size"] = strconv.FormatInt(actualSize, 10)
 
+		reader = etag.NewReader(reader, nil)
 		s2c := newS2CompressReader(reader, actualSize)
 		defer s2c.Close()
 		reader = etag.Wrap(s2c, reader)
@@ -1696,8 +1697,7 @@ func (api objectAPIHandlers) PutObjectHandler(w http.ResponseWriter, r *http.Req
 		return
 	}
 
-	switch kind, encrypted := crypto.IsEncrypted(objInfo.UserDefined); {
-	case encrypted:
+	if kind, encrypted := crypto.IsEncrypted(objInfo.UserDefined); encrypted {
 		switch kind {
 		case crypto.S3:
 			w.Header().Set(xhttp.AmzServerSideEncryption, xhttp.AmzEncryptionAES)
@@ -1719,10 +1719,6 @@ func (api objectAPIHandlers) PutObjectHandler(w http.ResponseWriter, r *http.Req
 				objInfo.ETag = objInfo.ETag[len(objInfo.ETag)-32:]
 			}
 		}
-	case objInfo.IsCompressed():
-		if !strings.HasSuffix(objInfo.ETag, "-1") {
-			objInfo.ETag = objInfo.ETag + "-1"
-		}
 	}
 	if replicate, sync := mustReplicate(ctx, r, bucket, object, metadata, "", false); replicate {
 		scheduleReplication(ctx, objInfo.Clone(), objectAPI, sync, replication.ObjectReplicationType)
diff --git a/pkg/etag/etag_test.go b/pkg/etag/etag_test.go
index f1f1167fd..2d8b1e251 100644
--- a/pkg/etag/etag_test.go
+++ b/pkg/etag/etag_test.go
@@ -25,6 +25,8 @@ import (
 	"testing"
 )
 
+var _ Tagger = Wrap(nil, nil).(Tagger) // runtime check that wrapReader implements Tagger
+
 var parseTests = []struct {
 	String     string
 	ETag       ETag
diff --git a/pkg/etag/reader.go b/pkg/etag/reader.go
index 2e5203ce1..2ee59a69c 100644
--- a/pkg/etag/reader.go
+++ b/pkg/etag/reader.go
@@ -34,8 +34,10 @@ type wrapReader struct {
 	Tagger
 }
 
+var _ Tagger = wrapReader{} // compiler check
+
 // ETag returns the ETag of the underlying Tagger.
-func (r *wrapReader) ETag() ETag {
+func (r wrapReader) ETag() ETag {
 	if r.Tagger == nil {
 		return nil
 	}
diff --git a/pkg/hash/reader.go b/pkg/hash/reader.go
index 23c635fd8..8e203babb 100644
--- a/pkg/hash/reader.go
+++ b/pkg/hash/reader.go
@@ -110,15 +110,22 @@ func NewReader(src io.Reader, size int64, md5Hex, sha256Hex string, actualSize i
 		return r, nil
 	}
 
-	var hash hash.Hash
 	if size >= 0 {
-		src = io.LimitReader(src, size)
+		r := io.LimitReader(src, size)
+		if _, ok := src.(etag.Tagger); !ok {
+			src = etag.NewReader(r, etag.ETag(MD5))
+		} else {
+			src = etag.Wrap(r, src)
+		}
+	} else if _, ok := src.(etag.Tagger); !ok {
+		src = etag.NewReader(src, etag.ETag(MD5))
 	}
+	var hash hash.Hash
 	if len(SHA256) != 0 {
 		hash = newSHA256()
 	}
 	return &Reader{
-		src:           etag.NewReader(src, etag.ETag(MD5)),
+		src:           src,
 		size:          size,
 		actualSize:    actualSize,
 		checksum:      etag.ETag(MD5),