diff --git a/packages/client/lib/functions/dpopUtil.ts b/packages/client/lib/functions/dpopUtil.ts
index 44065392..95d7266c 100644
--- a/packages/client/lib/functions/dpopUtil.ts
+++ b/packages/client/lib/functions/dpopUtil.ts
@@ -8,7 +8,7 @@ export function shouldRetryTokenRequestWithDPoPNonce(response: OpenIDResponse<un
     return { ok: false };
   }
 
-  const dPoPNonce = response.errorBody.headers.get('DPoP-Nonce');
+  const dPoPNonce = response.origResponse.headers.get('DPoP-Nonce');
   if (!dPoPNonce) {
     throw new Error('Missing required DPoP-Nonce header.');
   }
@@ -21,12 +21,12 @@ export function shouldRetryResourceRequestWithDPoPNonce(response: OpenIDResponse
     return { ok: false };
   }
 
-  const wwwAuthenticateHeader = response.errorBody.headers?.get('WWW-Authenticate');
+  const wwwAuthenticateHeader = response.origResponse.headers.get('WWW-Authenticate');
   if (!wwwAuthenticateHeader?.includes(dpopTokenRequestNonceError)) {
     return { ok: false };
   }
 
-  const dPoPNonce = response.errorBody.headers.get('DPoP-Nonce');
+  const dPoPNonce = response.origResponse.headers.get('DPoP-Nonce');
   if (!dPoPNonce) {
     throw new Error('Missing required DPoP-Nonce header.');
   }
diff --git a/packages/oid4vci-common/lib/types/Generic.types.ts b/packages/oid4vci-common/lib/types/Generic.types.ts
index 0a9e4e40..6e47568a 100644
--- a/packages/oid4vci-common/lib/types/Generic.types.ts
+++ b/packages/oid4vci-common/lib/types/Generic.types.ts
@@ -218,7 +218,7 @@ export interface JsonLdIssuerCredentialDefinition {
   credentialSubject?: IssuerCredentialSubject;
 }
 
-export interface ErrorResponse extends Response {
+export interface ErrorResponse {
   error: string;
   error_description?: string;
   error_uri?: string;