diff --git a/app/components/progress-bar.tsx b/app/components/progress-bar.tsx
index 6e7c5915..d493f709 100644
--- a/app/components/progress-bar.tsx
+++ b/app/components/progress-bar.tsx
@@ -1,5 +1,5 @@
-import { useNavigation } from 'react-router'
 import { useEffect, useRef, useState } from 'react'
+import { useNavigation } from 'react-router'
 import { useSpinDelay } from 'spin-delay'
 import { cn } from '#app/utils/misc.tsx'
 import { Icon } from './ui/icon.tsx'
diff --git a/app/root.tsx b/app/root.tsx
index 5fdd9ff3..2be10b0e 100644
--- a/app/root.tsx
+++ b/app/root.tsx
@@ -1,4 +1,3 @@
-import { wrapUseRoutesV7 } from '@sentry/react'
 import { useRef } from 'react'
 import {
 	data,
@@ -270,7 +269,7 @@ function AppWithProviders() {
 	)
 }
 
-export default wrapUseRoutesV7(AppWithProviders)
+export default AppWithProviders
 
 function UserDropdown() {
 	const user = useUser()
diff --git a/app/utils/client-hints.tsx b/app/utils/client-hints.tsx
index baf72d78..560f35af 100644
--- a/app/utils/client-hints.tsx
+++ b/app/utils/client-hints.tsx
@@ -8,8 +8,8 @@ import {
 	subscribeToSchemeChange,
 } from '@epic-web/client-hints/color-scheme'
 import { clientHint as timeZoneHint } from '@epic-web/client-hints/time-zone'
-import { useRevalidator } from 'react-router'
 import * as React from 'react'
+import { useRevalidator } from 'react-router'
 import { useOptionalRequestInfo, useRequestInfo } from './request-info.ts'
 
 const hintsUtils = getHintUtils({
diff --git a/app/utils/misc.tsx b/app/utils/misc.tsx
index e3ad6c6b..03567675 100644
--- a/app/utils/misc.tsx
+++ b/app/utils/misc.tsx
@@ -1,6 +1,6 @@
-import { useFormAction, useNavigation } from 'react-router'
 import { clsx, type ClassValue } from 'clsx'
 import { useEffect, useMemo, useRef, useState } from 'react'
+import { useFormAction, useNavigation } from 'react-router'
 import { useSpinDelay } from 'spin-delay'
 import { extendTailwindMerge } from 'tailwind-merge'
 import { extendedTheme } from './extended-theme.ts'
diff --git a/eslint.config.js b/eslint.config.js
index 5fa72f28..eede0cf7 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -8,4 +8,7 @@ export default [
 		files: ['**/tests/**/*.ts'],
 		rules: { 'react-hooks/rules-of-hooks': 'off' },
 	},
+	{
+		ignores: ['.react-router/*'],
+	},
 ]
diff --git a/react-router.config.ts b/react-router.config.ts
index e44bb40f..9d4a2e92 100644
--- a/react-router.config.ts
+++ b/react-router.config.ts
@@ -2,4 +2,8 @@ import { type Config } from '@react-router/dev/config'
 export default {
 	// Defaults to true. Set to false to enable SPA for all routes.
 	ssr: true,
+
+	future: {
+		unstable_optimizeDeps: true,
+	},
 } satisfies Config