diff --git a/ecstore/src/set_disk.rs b/ecstore/src/set_disk.rs
index 5d457bf22..5fa052c63 100644
--- a/ecstore/src/set_disk.rs
+++ b/ecstore/src/set_disk.rs
@@ -5463,7 +5463,11 @@ fn get_complete_multipart_md5(parts: &[CompletePart]) -> String {
 
     for part in parts.iter() {
         if let Some(etag) = &part.e_tag {
-            buf.extend(etag.bytes());
+            if let Ok(etag_bytes) = hex_simd::decode_to_vec(etag.as_bytes()) {
+                buf.extend(etag_bytes);
+            } else {
+                buf.extend(etag.bytes());
+            }
         }
     }