diff --git a/apps/beets-frontend-v3/lib/services/chakra/ThemeProvider.tsx b/apps/beets-frontend-v3/lib/services/chakra/ThemeProvider.tsx
index 32565602c..1e612e98c 100644
--- a/apps/beets-frontend-v3/lib/services/chakra/ThemeProvider.tsx
+++ b/apps/beets-frontend-v3/lib/services/chakra/ThemeProvider.tsx
@@ -3,8 +3,14 @@
 import { ChakraProvider } from '@chakra-ui/react'
 import { ReactNode } from 'react'
 import { theme } from './themes/beets/beets.theme'
+import { useIsMounted } from '@repo/lib/shared/hooks/useIsMounted'
 
 export function ThemeProvider({ children }: { children: ReactNode }) {
+  const isMounted = useIsMounted()
+
+  // Avoid hydration error in turbopack mode
+  if (!isMounted) return null
+
   return (
     <ChakraProvider
       cssVarsRoot="body"