diff --git a/tauri/src/main.tsx b/tauri/src/main.tsx
index 398fc57e..5c1eadb9 100644
--- a/tauri/src/main.tsx
+++ b/tauri/src/main.tsx
@@ -1,24 +1,15 @@
+import { QueryClientProvider } from '@tanstack/react-query';
 import React from 'react';
 import ReactDOM from 'react-dom/client';
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 // import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
 import App from '@/App';
 // Import CSS from app directory using alias so Tailwind can scan the source files
 import '@/index.css';
+import '@/i18n';
+import { queryClient } from '@/lib/queryClient';
 import { PlatformProvider } from '@/platform/PlatformContext';
 import { tauriPlatform } from './platform';
 
-const queryClient = new QueryClient({
-  defaultOptions: {
-    queries: {
-      staleTime: 1000 * 60 * 5, // 5 minutes
-      gcTime: 1000 * 60 * 10, // 10 minutes
-      retry: 1,
-      refetchOnWindowFocus: false,
-    },
-  },
-});
-
 ReactDOM.createRoot(document.getElementById('root')!).render(
   <React.StrictMode>
     <QueryClientProvider client={queryClient}>
diff --git a/web/src/main.tsx b/web/src/main.tsx
index 771f07e8..5a344f19 100644
--- a/web/src/main.tsx
+++ b/web/src/main.tsx
@@ -1,22 +1,13 @@
+import { QueryClientProvider } from '@tanstack/react-query';
 import React from 'react';
 import ReactDOM from 'react-dom/client';
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import App from '../../app/src/App';
 import '../../app/src/index.css';
+import '../../app/src/i18n';
+import { queryClient } from '../../app/src/lib/queryClient';
 import { PlatformProvider } from '../../app/src/platform/PlatformContext';
 import { webPlatform } from './platform';
 
-const queryClient = new QueryClient({
-  defaultOptions: {
-    queries: {
-      staleTime: 1000 * 60 * 5, // 5 minutes
-      gcTime: 1000 * 60 * 10, // 10 minutes
-      retry: 1,
-      refetchOnWindowFocus: false,
-    },
-  },
-});
-
 ReactDOM.createRoot(document.getElementById('root')!).render(
   <React.StrictMode>
     <QueryClientProvider client={queryClient}>