diff --git a/src/app/Document.tsx b/src/app/Document.tsx
index c6badc8f2..36612f57d 100644
--- a/src/app/Document.tsx
+++ b/src/app/Document.tsx
@@ -10,6 +10,7 @@ import { Viewport } from '@/components/Viewport';
 import { EnvDevHint } from '@/layout/EnvDevHint';
 import i18n from '@/lib/i18n/client';
 import { AVAILABLE_LANGUAGES } from '@/lib/i18n/constants';
+import { TrpcProvider } from '@/lib/trpc/TrpcProvider';
 import theme, { COLOR_MODE_STORAGE_KEY } from '@/theme';
 
 export const Document = ({ children }: { children: ReactNode }) => {
@@ -68,11 +69,13 @@ export const Document = ({ children }: { children: ReactNode }) => {
           storageKey={COLOR_MODE_STORAGE_KEY}
         />
 
-        <Providers>
-          <Viewport>{children}</Viewport>
-          <EnvDevHint />
-          <ReactQueryDevtools initialIsOpen={false} />
-        </Providers>
+        <TrpcProvider>
+          <Providers>
+            <Viewport>{children}</Viewport>
+            <EnvDevHint />
+            <ReactQueryDevtools initialIsOpen={false} />
+          </Providers>
+        </TrpcProvider>
       </body>
     </html>
   );
diff --git a/src/app/Providers.tsx b/src/app/Providers.tsx
index 3c0ef3836..2d17e7c4a 100644
--- a/src/app/Providers.tsx
+++ b/src/app/Providers.tsx
@@ -28,7 +28,7 @@ export const Providers: FC<React.PropsWithChildren<unknown>> = ({
             'ltr',
         }}
       >
-        <TrpcProvider>{children}</TrpcProvider>
+        {children}
       </ChakraProvider>
     </CacheProvider>
   );