diff --git a/package.json b/package.json
index fae18cd..38ba773 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,6 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "axios": "^1.13.6",
     "lucide-vue-next": "^0.577.0",
     "pinia": "^3.0.4",
     "vue": "^3.5.30",
diff --git a/src/components/TimetableSearch/JournalSearchInput.vue b/src/components/TimetableSearch/JournalSearchInput.vue
index ed1ed70..1ed8ad9 100644
--- a/src/components/TimetableSearch/JournalSearchInput.vue
+++ b/src/components/TimetableSearch/JournalSearchInput.vue
@@ -105,11 +105,10 @@ async function fetchJournalTimetables() {
   try {
     apiStore.journalDataStatus = DataStatus.LOADING;
 
-    const response = (
-      await apiStore.client!.get<JournalTimetablesShortResponse>('/api/getTimetables', {
-        params: fetchParams
-      })
-    ).data;
+    const response = await apiStore.client.get<JournalTimetablesShortResponse>(
+      'api/getTimetables',
+      fetchParams
+    );
 
     apiStore.journalDataStatus = DataStatus.SUCCESS;
     apiStore.journalTimetablesData = response;
diff --git a/src/components/TimetableViews/JournalStorageView.vue b/src/components/TimetableViews/JournalStorageView.vue
index 422a907..cba67be 100644
--- a/src/components/TimetableViews/JournalStorageView.vue
+++ b/src/components/TimetableViews/JournalStorageView.vue
@@ -1,6 +1,8 @@
 <template>
   <div class="text-white">
-    <h2 class="font-bold p-2 bg-zinc-700 mb-3 text-2xl flex items-center gap-2 justify-center flex-wrap">
+    <h2
+      class="font-bold p-2 bg-zinc-700 mb-3 text-2xl flex items-center gap-2 justify-center flex-wrap"
+    >
       <HistoryIcon :size="25" />
       {{ $t('journal-preview-title') }}
     </h2>
@@ -77,15 +79,10 @@ const globalStore = useGlobalStore();
 
 async function fetchTimetableDetails(id: number) {
   try {
-    const response = (
-      await apiStore.client!.get<JournalTimetableDetailed[]>('/api/getTimetables', {
-        params: {
-          timetableId: id,
-          hasStopsDetails: 1,
-          returnType: 'detailed'
-        }
-      })
-    ).data;
+    const response = await apiStore.client.get<JournalTimetableDetailed[]>('api/getTimetables', {
+      timetableId: id,
+      returnType: 'detailed'
+    });
 
     if (response.length > 0) globalStore.selectedJournalTimetable = response[0];
   } catch (error) {
diff --git a/src/http.ts b/src/http.ts
index f23e062..5486369 100644
--- a/src/http.ts
+++ b/src/http.ts
@@ -15,7 +15,7 @@ export class HttpClient {
     const data = await fetch(absoluteURL);
 
     if (!data.ok) {
-      throw new Error(`Cannaot fetch: ${absoluteURL}`);
+      throw new Error(`Cannot fetch ${absoluteURL}: ${data.status}`);
     }
 
     return data.json();
diff --git a/src/stores/api.store.ts b/src/stores/api.store.ts
index 9c2c31e..d90f785 100644
--- a/src/stores/api.store.ts
+++ b/src/stores/api.store.ts
@@ -1,5 +1,3 @@
-import type { AxiosInstance } from 'axios';
-import axios from 'axios';
 import { defineStore } from 'pinia';
 import {
   DataStatus,
@@ -13,13 +11,28 @@ import type {
   SceneryData,
   VehicleData
 } from '../types/common.types';
+import { HttpClient } from '../http';
 
 let activeDataInterval = -1;
 
+// Base API URL
+let baseURL = 'https://stacjownik.spythere.eu';
+
+switch (import.meta.env.VITE_API_MODE) {
+  case 'development':
+    baseURL = 'http://localhost:3001';
+    break;
+  case 'mocking':
+    baseURL = 'http://localhost:3123';
+    break;
+  default:
+    break;
+}
+
 export const useApiStore = defineStore('api', {
   state() {
     return {
-      client: null as AxiosInstance | null,
+      client: new HttpClient(baseURL),
 
       activeData: null as ActiveData | null,
       sceneryData: null as SceneryData[] | null,
@@ -38,25 +51,6 @@ export const useApiStore = defineStore('api', {
 
   actions: {
     async setupAPIData() {
-      if (this.client == null) {
-        let baseURL = 'https://stacjownik.spythere.eu';
-
-        switch (import.meta.env.VITE_API_MODE) {
-          case 'development':
-            baseURL = 'http://localhost:3001';
-            break;
-          case 'mocking':
-            baseURL = 'http://localhost:3123';
-            break;
-          default:
-            break;
-        }
-
-        this.client = axios.create({
-          baseURL
-        });
-      }
-
       clearInterval(activeDataInterval);
 
       activeDataInterval = setInterval(() => {
@@ -71,7 +65,7 @@ export const useApiStore = defineStore('api', {
 
     async fetchActiveData() {
       try {
-        const response = (await this.client!.get<ActiveDataResponse>('/api/getActiveData')).data;
+        const response = await this.client.get<ActiveDataResponse>('api/getActiveData');
 
         this.activeData = response;
         this.activeDataStatus = DataStatus.SUCCESS;
@@ -89,7 +83,7 @@ export const useApiStore = defineStore('api', {
 
     async fetchSceneriesData() {
       try {
-        const response = (await this.client!.get<SceneriesDataResponse>('/api/getSceneries')).data;
+        const response = await this.client.get<SceneriesDataResponse>('api/getSceneries');
 
         this.sceneryData = response;
       } catch (error) {
@@ -99,7 +93,7 @@ export const useApiStore = defineStore('api', {
 
     async fetchVehiclesData() {
       try {
-        const response = (await this.client!.get<VehiclesDataResponse>('/api/getVehicles')).data;
+        const response = await this.client.get<VehiclesDataResponse>('api/getVehicles');
 
         this.vehiclesData = response;
       } catch (error) {
diff --git a/tsconfig.app.tsbuildinfo b/tsconfig.app.tsbuildinfo
index 11d0cc0..1d3660b 100644
--- a/tsconfig.app.tsbuildinfo
+++ b/tsconfig.app.tsbuildinfo
@@ -1 +1 @@
-{"root":["./src/i18n.ts","./src/main.ts","./src/vite-env.d.ts","./src/mixins/useVehicleMixin.ts","./src/stores/api.store.ts","./src/stores/global.store.ts","./src/types/api.types.ts","./src/types/common.types.ts","./src/utils/dateUtils.ts","./src/utils/trainUtils.ts","./src/App.vue","./src/components/App/MainBottom.vue","./src/components/App/MainContainer.vue","./src/components/App/MigrateInfo.vue","./src/components/App/Navbar.vue","./src/components/App/SettingsCard.vue","./src/components/App/UpdatePrompt.vue","./src/components/Timetable/TimetableContainer.vue","./src/components/Timetable/TimetableContent.vue","./src/components/Timetable/TimetableContentCZ.vue","./src/components/Timetable/TimetableWarnings.vue","./src/components/TimetableSearch/ActiveSearchInput.vue","./src/components/TimetableSearch/JournalSearchInput.vue","./src/components/TimetableSearch/LocalSearchInput.vue","./src/components/TimetableSearch/SearchContainer.vue","./src/components/TimetableSearch/SearchModeActions.vue","./src/components/TimetableViews/ActiveDataView.vue","./src/components/TimetableViews/CurrentTimetableView.vue","./src/components/TimetableViews/JournalStorageView.vue","./src/components/TimetableViews/LocalStorageView.vue"],"version":"5.9.3"}
\ No newline at end of file
+{"root":["./src/http.ts","./src/i18n.ts","./src/main.ts","./src/vite-env.d.ts","./src/mixins/useVehicleMixin.ts","./src/stores/api.store.ts","./src/stores/global.store.ts","./src/types/api.types.ts","./src/types/common.types.ts","./src/utils/dateUtils.ts","./src/utils/trainUtils.ts","./src/App.vue","./src/components/App/MainBottom.vue","./src/components/App/MainContainer.vue","./src/components/App/MigrateInfo.vue","./src/components/App/Navbar.vue","./src/components/App/SettingsCard.vue","./src/components/App/UpdatePrompt.vue","./src/components/Timetable/TimetableContainer.vue","./src/components/Timetable/TimetableContent.vue","./src/components/Timetable/TimetableContentCZ.vue","./src/components/Timetable/TimetableWarnings.vue","./src/components/TimetableSearch/ActiveSearchInput.vue","./src/components/TimetableSearch/JournalSearchInput.vue","./src/components/TimetableSearch/LocalSearchInput.vue","./src/components/TimetableSearch/SearchContainer.vue","./src/components/TimetableSearch/SearchModeActions.vue","./src/components/TimetableViews/ActiveDataView.vue","./src/components/TimetableViews/CurrentTimetableView.vue","./src/components/TimetableViews/JournalStorageView.vue","./src/components/TimetableViews/LocalStorageView.vue"],"version":"5.9.3"}
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 62acf9d..b52d300 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1577,11 +1577,6 @@ async@^3.2.3:
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce"
   integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==
 
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
-
 at-least-node@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
@@ -1606,15 +1601,6 @@ available-typed-arrays@^1.0.7:
   dependencies:
     possible-typed-array-names "^1.0.0"
 
-axios@^1.13.6:
-  version "1.13.6"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.13.6.tgz#c3f92da917dc209a15dd29936d20d5089b6b6c98"
-  integrity sha512-ChTCHMouEe2kn713WHbQGcuYrr6fXTBiu460OTwWrWob16g1bXn4vtz07Ope7ewMozJAnEquLk5lWQWtBig9DQ==
-  dependencies:
-    follow-redirects "^1.15.11"
-    form-data "^4.0.5"
-    proxy-from-env "^1.1.0"
-
 babel-plugin-polyfill-corejs2@^0.4.10:
   version "0.4.13"
   resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.13.tgz#7d445f0e0607ebc8fb6b01d7e8fb02069b91dd8b"
@@ -1774,13 +1760,6 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-combined-stream@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
-
 commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -1901,11 +1880,6 @@ define-properties@^1.2.1:
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
-
 didyoumean@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037"
@@ -2164,11 +2138,6 @@ fill-range@^7.1.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-follow-redirects@^1.15.11:
-  version "1.15.11"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.11.tgz#777d73d72a92f8ec4d2e410eb47352a56b8e8340"
-  integrity sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==
-
 for-each@^0.3.3, for-each@^0.3.5:
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.5.tgz#d650688027826920feeb0af747ee7b9421a41d47"
@@ -2192,17 +2161,6 @@ foreground-child@^3.3.1:
     cross-spawn "^7.0.6"
     signal-exit "^4.0.1"
 
-form-data@^4.0.5:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.5.tgz#b49e48858045ff4cbf6b03e1805cebcad3679053"
-  integrity sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.8"
-    es-set-tostringtag "^2.1.0"
-    hasown "^2.0.2"
-    mime-types "^2.1.12"
-
 fraction.js@^4.3.7:
   version "4.3.7"
   resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7"
@@ -2794,18 +2752,6 @@ micromatch@^4.0.8:
     braces "^3.0.3"
     picomatch "^2.3.1"
 
-mime-db@1.52.0:
-  version "1.52.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
-  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
-
-mime-types@^2.1.12:
-  version "2.1.35"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
-  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
-  dependencies:
-    mime-db "1.52.0"
-
 minimatch@^10.1.1:
   version "10.2.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.2.4.tgz#465b3accbd0218b8281f5301e27cedc697f96fde"
@@ -3079,11 +3025,6 @@ pretty-bytes@^6.1.1:
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-6.1.1.tgz#38cd6bb46f47afbf667c202cfc754bffd2016a3b"
   integrity sha512-mQUvGU6aUFQ+rNvTIAcZuWGRT9a6f6Yrg9bHs4ImKF+HZCEK+plBvnAZYSIQztknZF2qnzNtr6F8s0+IuptdlQ==
 
-proxy-from-env@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
-  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
-
 punycode@^2.1.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"