diff --git a/packages/service/src/service/base.ts b/packages/service/src/service/base.ts
index b8bab5cd..5abf1453 100644
--- a/packages/service/src/service/base.ts
+++ b/packages/service/src/service/base.ts
@@ -32,15 +32,14 @@ export class BtcAssetsApiBase implements BaseApis {
       await this.init();
     }
 
-    const packedParams = params ? '?' + new URLSearchParams(pickBy(params, (val) => val !== undefined)).toString() : '';
-    const withOriginHeaders = this.origin ? { origin: this.origin } : undefined;
-    const withAuthHeaders = requireToken && this.token ? { Authorization: `Bearer ${this.token}` } : undefined;
+    const pickedParams = pickBy(params, (val) => val !== undefined);
+    const packedParams = params ? '?' + new URLSearchParams(pickedParams).toString() : '';
     const url = `${this.url}${route}${packedParams}`;
     const res = await fetch(url, {
       method,
       headers: {
-        ...withOriginHeaders,
-        ...withAuthHeaders,
+        authorization: this.token ? `Bearer ${this.token}` : undefined,
+        origin: this.origin,
         ...headers,
       },
       ...otherOptions,
@@ -96,7 +95,7 @@ export class BtcAssetsApiBase implements BaseApis {
     if (status !== 200 && status !== 404 && !allow404) {
       throw BtcAssetsApiError.withComment(ErrorCodes.ASSETS_API_RESPONSE_ERROR, comment, context);
     }
-    if (status !== 200) {
+    if (status === 404 && allow404) {
       return undefined as T;
     }
 
diff --git a/packages/service/vitest.config.mts b/packages/service/vitest.config.mts
index 2d9b2ac0..69b2c0b4 100644
--- a/packages/service/vitest.config.mts
+++ b/packages/service/vitest.config.mts
@@ -3,7 +3,7 @@ import { defineConfig } from 'vitest/config';
 export default defineConfig({
   test: {
     watch: false,
-    testTimeout: 15000,
+    testTimeout: 20000,
     reporters: ['verbose'],
     exclude: ['lib', 'node_modules'],
   },