diff --git a/registry/remote/repository.go b/registry/remote/repository.go
index d9d4d172..2d81b11b 100644
--- a/registry/remote/repository.go
+++ b/registry/remote/repository.go
@@ -1608,10 +1608,6 @@ func (s *manifestStore) generateDescriptor(resp *http.Response, ref registry.Ref
 // calculateDigestFromResponse calculates the actual digest of the response body
 // taking care not to destroy it in the process.
 func calculateDigestFromResponse(resp *http.Response, maxMetadataBytes int64) (digest.Digest, error) {
-	// TODO: move this to another PR
-	if resp.Body == nil {
-		return "", fmt.Errorf("%s %q: response body is nil", resp.Request.Method, resp.Request.URL)
-	}
 	defer resp.Body.Close()
 
 	body := limitReader(resp.Body, maxMetadataBytes)
diff --git a/registry/remote/repository_test.go b/registry/remote/repository_test.go
index b4694150..26b65257 100644
--- a/registry/remote/repository_test.go
+++ b/registry/remote/repository_test.go
@@ -7815,53 +7815,6 @@ func TestManifestStore_generateDescriptor(t *testing.T) {
 			wantDescriptor: ocispec.Descriptor{},
 			wantErr:        true,
 		},
-		{
-			name: "resp with body, missing Docker-Content-Digest",
-			resp: &http.Response{
-				Header: http.Header{
-					"Content-Type": []string{mediaType},
-				},
-				ContentLength: dataSize,
-				Request: &http.Request{
-					Method: http.MethodGet,
-					URL:    &url.URL{Path: "/test"},
-				},
-				Body: io.NopCloser(bytes.NewReader(data)),
-			},
-			ref: registry.Reference{
-				Registry:   "registry.example.com",
-				Repository: "hello-world",
-				Reference:  dataDigest.String(),
-			},
-			httpMethod: http.MethodGet,
-			wantDescriptor: ocispec.Descriptor{
-				MediaType: mediaType,
-				Digest:    dataDigest,
-				Size:      dataSize,
-			},
-			wantErr: false,
-		},
-		{
-			name: "resp without body, missing Docker-Content-Digest",
-			resp: &http.Response{
-				Header: http.Header{
-					"Content-Type": []string{mediaType},
-				},
-				ContentLength: dataSize,
-				Request: &http.Request{
-					Method: http.MethodGet,
-					URL:    &url.URL{Path: "/test"},
-				},
-			},
-			ref: registry.Reference{
-				Registry:   "registry.example.com",
-				Repository: "hello-world",
-				Reference:  dataDigest.String(),
-			},
-			httpMethod:     http.MethodGet,
-			wantDescriptor: ocispec.Descriptor{},
-			wantErr:        true,
-		},
 		{
 			name: "failed to read resp with body, missing Docker-Content-Digest",
 			resp: &http.Response{