diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 7b6dfae6f..3e300ad93 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -11,7 +11,8 @@
 		"build": "tauri build"
 	},
 	"dependencies": {
-		"@rspc/client": "^0.0.5",
+		"@rspc/client": "^0.0.6",
+		"@rspc/tauri": "^0.0.6",
 		"@sd/client": "workspace:*",
 		"@sd/core": "workspace:*",
 		"@sd/interface": "workspace:*",
diff --git a/apps/desktop/src/index.tsx b/apps/desktop/src/index.tsx
index 93a94fdf2..ad21450db 100644
--- a/apps/desktop/src/index.tsx
+++ b/apps/desktop/src/index.tsx
@@ -1,9 +1,10 @@
 // import Spacedrive JS client
-import { TauriTransport, createClient } from '@rspc/client';
+import { createClient } from '@rspc/client';
+import { TauriTransport } from '@rspc/tauri';
 import { Operations, queryClient, rspc } from '@sd/client';
 import SpacedriveInterface, { Platform } from '@sd/interface';
 import { dialog, invoke, os, shell } from '@tauri-apps/api';
-import { Event, listen } from '@tauri-apps/api/event';
+import { listen } from '@tauri-apps/api/event';
 import { convertFileSrc } from '@tauri-apps/api/tauri';
 import { appWindow } from '@tauri-apps/api/window';
 import React, { useEffect, useState } from 'react';
diff --git a/apps/mobile/package.json b/apps/mobile/package.json
index 530172d90..f1c15ee93 100644
--- a/apps/mobile/package.json
+++ b/apps/mobile/package.json
@@ -17,7 +17,8 @@
 		"@react-navigation/drawer": "^6.4.4",
 		"@react-navigation/native": "^6.0.12",
 		"@react-navigation/stack": "^6.2.3",
-		"@rspc/client": "^0.0.5",
+		"@rspc/client": "^0.0.6",
+		"@rspc/react": "^0.0.6",
 		"@sd/assets": "file:../../packages/assets",
 		"@tanstack/react-query": "^4.2.3",
 		"byte-size": "^8.1.0",
diff --git a/apps/mobile/pnpm-lock.yaml b/apps/mobile/pnpm-lock.yaml
index ed2cad9fe..84ec59b3d 100644
Binary files a/apps/mobile/pnpm-lock.yaml and b/apps/mobile/pnpm-lock.yaml differ
diff --git a/apps/mobile/src/hooks/rspc.ts b/apps/mobile/src/hooks/rspc.ts
index d1ed6bcb3..0df3939c0 100644
--- a/apps/mobile/src/hooks/rspc.ts
+++ b/apps/mobile/src/hooks/rspc.ts
@@ -1,11 +1,5 @@
-import {
-	ClientTransformer,
-	OperationKey,
-	OperationType,
-	RSPCError,
-	Transport,
-	createReactQueryHooks
-} from '@rspc/client';
+import { ClientTransformer, OperationKey, OperationType, RSPCError, Transport } from '@rspc/client';
+import { createReactQueryHooks } from '@rspc/react';
 import {
 	QueryClient,
 	UseMutationOptions,
diff --git a/apps/web/package.json b/apps/web/package.json
index 04c98aa0e..ebf8ff194 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"@fontsource/inter": "^4.5.11",
-		"@rspc/client": "^0.0.5",
+		"@rspc/client": "^0.0.6",
 		"@sd/client": "workspace:*",
 		"@sd/core": "workspace:*",
 		"@sd/interface": "workspace:*",
diff --git a/apps/web/src/App.tsx b/apps/web/src/App.tsx
index a01b6386a..d0d841464 100644
--- a/apps/web/src/App.tsx
+++ b/apps/web/src/App.tsx
@@ -1,7 +1,7 @@
 import { WebsocketTransport, createClient } from '@rspc/client';
 import { Operations, queryClient, rspc } from '@sd/client';
 import SpacedriveInterface from '@sd/interface';
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
 
 const client = createClient<Operations>({
 	transport: new WebsocketTransport(
diff --git a/packages/client/package.json b/packages/client/package.json
index 1c9df3845..a5d5abc0b 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -17,9 +17,10 @@
 		"preset": "scripts/jest/node"
 	},
 	"dependencies": {
-		"@rspc/client": "^0.0.5",
-		"@sd/core": "workspace:*",
+		"@rspc/client": "^0.0.6",
+		"@rspc/react": "^0.0.6",
 		"@sd/config": "workspace:*",
+		"@sd/core": "workspace:*",
 		"@sd/interface": "workspace:*",
 		"@tanstack/react-query": "^4.0.10",
 		"eventemitter3": "^4.0.7",
diff --git a/packages/client/src/rspc.ts b/packages/client/src/rspc.ts
index 576c10136..713a3c916 100644
--- a/packages/client/src/rspc.ts
+++ b/packages/client/src/rspc.ts
@@ -1,4 +1,5 @@
-import { RSPCError, createReactQueryHooks } from '@rspc/client';
+import { RSPCError } from '@rspc/client';
+import { createReactQueryHooks } from '@rspc/react';
 import { LibraryArgs, Operations } from '@sd/core';
 import {
 	QueryClient,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fae647339..a3bdd7687 100644
Binary files a/pnpm-lock.yaml and b/pnpm-lock.yaml differ