diff --git a/src/orpc/client.ts b/src/orpc/client.ts
index 0f76faa..8d7c750 100644
--- a/src/orpc/client.ts
+++ b/src/orpc/client.ts
@@ -1,11 +1,10 @@
 import { createORPCClient } from '@orpc/client'
 import { RPCLink } from '@orpc/client/fetch'
-import type { RouterClient } from '@orpc/server'
 import { createRouterClient } from '@orpc/server'
 import { createTanstackQueryUtils } from '@orpc/tanstack-query'
 import { createIsomorphicFn } from '@tanstack/react-start'
 import { getRequestHeaders } from '@tanstack/react-start/server'
-import { router } from '@/orpc/router'
+import { type RouterClient, router } from '@/orpc'
 
 const getORPCClient = createIsomorphicFn()
   .server(() =>
@@ -15,13 +14,13 @@ const getORPCClient = createIsomorphicFn()
       }),
     }),
   )
-  .client((): RouterClient<typeof router> => {
+  .client(() => {
     const link = new RPCLink({
       url: `${window.location.origin}/api/rpc`,
     })
-    return createORPCClient(link)
+    return createORPCClient<RouterClient>(link)
   })
 
-const client: RouterClient<typeof router> = getORPCClient()
+const client: RouterClient = getORPCClient()
 
 export const orpc = createTanstackQueryUtils(client)
diff --git a/src/orpc/router.ts b/src/orpc/router.ts
index 70b205b..bfb314d 100644
--- a/src/orpc/router.ts
+++ b/src/orpc/router.ts
@@ -1,5 +1,8 @@
+import type { RouterClient as ORPCRouterClient } from '@orpc/server'
 import * as todo from './handlers/todo'
 
 export const router = {
   todo,
 }
+
+export type RouterClient = ORPCRouterClient<typeof router>