diff --git a/packages/core/src/__tests__/cogniteClient.unit.spec.ts b/packages/core/src/__tests__/cogniteClient.unit.spec.ts
index 4aeb579b63..dd34c42426 100644
--- a/packages/core/src/__tests__/cogniteClient.unit.spec.ts
+++ b/packages/core/src/__tests__/cogniteClient.unit.spec.ts
@@ -100,27 +100,6 @@ describe('CogniteClient', () => {
         expect(result.data).toEqual({ body: 'request ok' });
       });
 
-      test('401 handler should reject if the same token is returned', async () => {
-        const getToken = jest.fn().mockResolvedValue('401-test-token');
-
-        const scope = nock(mockBaseUrl).get('/test').twice().reply(401, {});
-
-        const client = new BaseCogniteClient({
-          project,
-          appId: 'unit-test',
-          baseUrl: mockBaseUrl,
-          getToken,
-        });
-
-        await expect(
-          async () => await client.get('/test')
-        ).rejects.toThrowErrorMatchingInlineSnapshot(
-          `"Request failed | status code: 401"`
-        );
-
-        scope.done();
-      });
-
       test('getToken rejection should reject sdk requests', async () => {
         const getToken = jest.fn().mockRejectedValue(new Error('auth error'));
 
diff --git a/packages/core/src/baseCogniteClient.ts b/packages/core/src/baseCogniteClient.ts
index 893b60b901..e0763c70d3 100644
--- a/packages/core/src/baseCogniteClient.ts
+++ b/packages/core/src/baseCogniteClient.ts
@@ -133,10 +133,9 @@ export default class BaseCogniteClient {
 
     this.httpClient.set401ResponseHandler(async (_, retry, reject) => {
       try {
-        const previousToken = this.retrieveTokenValueFromHeader();
+        const previousToken = this.retrieveTokenValueFromHeader(_.headers);
 
         const newToken = await this.authenticate();
-
         if (newToken && newToken !== previousToken) {
           retry();
         } else {
@@ -166,15 +165,13 @@ export default class BaseCogniteClient {
     }
   };
 
-  private retrieveTokenValueFromHeader(): string {
+  private retrieveTokenValueFromHeader(headers: HttpHeaders): string {
     let previousToken;
 
-    const defaultRequestHeaders = this.getDefaultRequestHeaders();
-
     if (this.apiKeyMode) {
-      previousToken = defaultRequestHeaders[API_KEY_HEADER];
+      previousToken = headers[API_KEY_HEADER];
     } else {
-      previousToken = defaultRequestHeaders[AUTHORIZATION_HEADER];
+      previousToken = headers[AUTHORIZATION_HEADER];
     }
     return previousToken;
   }
diff --git a/packages/stable/src/__tests__/api/documentsApi.int.spec.ts b/packages/stable/src/__tests__/api/documentsApi.int.spec.ts
index 56889ba17b..78a364bd80 100644
--- a/packages/stable/src/__tests__/api/documentsApi.int.spec.ts
+++ b/packages/stable/src/__tests__/api/documentsApi.int.spec.ts
@@ -2,7 +2,7 @@
 
 import CogniteClient from '../../cogniteClient';
 import { setupLoggedInClient } from '../testUtils';
-import { DocumentSearchResponse } from '@cognite/sdk-stable/dist';
+import { DocumentSearchResponse } from '@cognite/sdk-stable';
 import { TextEncoder } from 'util';
 
 const getFileId = async (