diff --git a/registry/storage/driver/s3-aws/s3.go b/registry/storage/driver/s3-aws/s3.go
index de22e887c..7ee0f79e2 100644
--- a/registry/storage/driver/s3-aws/s3.go
+++ b/registry/storage/driver/s3-aws/s3.go
@@ -599,6 +599,10 @@ var setContentLength = request.NamedHandler{
 			if r.HTTPResponse.ContentLength > 0 {
 				v.SetContentLength(r.HTTPResponse.ContentLength)
 			}
+		case *s3.GetObjectOutput:
+			if r.HTTPResponse.ContentLength > 0 {
+				v.SetContentLength(r.HTTPResponse.ContentLength)
+			}
 		}
 	},
 }