diff --git a/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java b/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
index f317ad7..f70f055 100644
--- a/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
+++ b/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
@@ -1111,10 +1111,10 @@ final class S3ProxyHandler extends AbstractHandler {
                 builder.contentDisposition(metadata.getContentDisposition())
                         .contentEncoding(metadata.getContentEncoding())
                         .contentLanguage(metadata.getContentLanguage())
-                        .contentLength(metadata.getContentLength())
                         .contentType(metadata.getContentType())
                         .userMetadata(blob.getMetadata().getUserMetadata());
             }
+            builder.contentLength(metadata.getContentLength());
 
             PutOptions options = new PutOptions()
                     .multipart(forceMultiPartUpload);