diff --git a/package.json b/package.json
index 46d5f96f4b..a8a6ec0ac3 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
     "react-dom-17": "npm:react-dom@^17.0.2",
     "rimraf": "^3.0.2",
     "rollup": "^2.70.2",
-    "rollup-plugin-preserve-directives": "0.1.0",
+    "rollup-plugin-preserve-directives": "0.2.0",
     "rollup-plugin-size": "^0.2.2",
     "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-visualizer": "^5.6.0",
diff --git a/packages/react-query-persist-client/package.json b/packages/react-query-persist-client/package.json
index 1bd7fc7d82..a5cfe2cd57 100644
--- a/packages/react-query-persist-client/package.json
+++ b/packages/react-query-persist-client/package.json
@@ -45,7 +45,8 @@
     "@tanstack/react-query": "workspace:*"
   },
   "dependencies": {
-    "@tanstack/query-persist-client-core": "workspace:*"
+    "@tanstack/query-persist-client-core": "workspace:*",
+    "client-only": "0.0.1"
   },
   "peerDependencies": {
     "@tanstack/react-query": "workspace:*"
diff --git a/packages/react-query-persist-client/src/PersistQueryClientProvider.tsx b/packages/react-query-persist-client/src/PersistQueryClientProvider.tsx
index ecfc916a2b..cb0ecb7dd8 100644
--- a/packages/react-query-persist-client/src/PersistQueryClientProvider.tsx
+++ b/packages/react-query-persist-client/src/PersistQueryClientProvider.tsx
@@ -1,4 +1,4 @@
-'use client'
+import 'client-only'
 import * as React from 'react'
 
 import type { PersistQueryClientOptions } from '@tanstack/query-persist-client-core'
diff --git a/packages/react-query/package.json b/packages/react-query/package.json
index 48d4bc02d8..79f3ed7aa5 100644
--- a/packages/react-query/package.json
+++ b/packages/react-query/package.json
@@ -55,6 +55,7 @@
   },
   "dependencies": {
     "@tanstack/query-core": "workspace:*",
+    "client-only": "0.0.1",
     "use-sync-external-store": "^1.2.0"
   },
   "peerDependencies": {
diff --git a/packages/react-query/src/QueryClientProvider.tsx b/packages/react-query/src/QueryClientProvider.tsx
index da4ba57880..37e860dc93 100644
--- a/packages/react-query/src/QueryClientProvider.tsx
+++ b/packages/react-query/src/QueryClientProvider.tsx
@@ -1,4 +1,4 @@
-'use client'
+import 'client-only'
 import * as React from 'react'
 
 import type { QueryClient } from '@tanstack/query-core'
diff --git a/packages/react-query/src/useBaseQuery.ts b/packages/react-query/src/useBaseQuery.ts
index 87d3ff5eca..cebc0f69d7 100644
--- a/packages/react-query/src/useBaseQuery.ts
+++ b/packages/react-query/src/useBaseQuery.ts
@@ -1,4 +1,4 @@
-'use client'
+import 'client-only'
 import * as React from 'react'
 import { useSyncExternalStore } from './useSyncExternalStore'
 
diff --git a/packages/react-query/src/useInfiniteQuery.ts b/packages/react-query/src/useInfiniteQuery.ts
index 85e78699bd..d0074b8f53 100644
--- a/packages/react-query/src/useInfiniteQuery.ts
+++ b/packages/react-query/src/useInfiniteQuery.ts
@@ -1,4 +1,4 @@
-'use client'
+import 'client-only'
 import type {
   QueryObserver,
   QueryFunction,
diff --git a/packages/react-query/src/useIsFetching.ts b/packages/react-query/src/useIsFetching.ts
index ceac657496..cb17b0fe4a 100644
--- a/packages/react-query/src/useIsFetching.ts
+++ b/packages/react-query/src/useIsFetching.ts
@@ -1,4 +1,4 @@
-'use client'
+import 'client-only'
 import * as React from 'react'
 import type { QueryKey, QueryFilters } from '@tanstack/query-core'
 import { notifyManager, parseFilterArgs } from '@tanstack/query-core'
diff --git a/packages/react-query/src/useIsMutating.ts b/packages/react-query/src/useIsMutating.ts
index 97c3ad2e4b..f3ed94f755 100644
--- a/packages/react-query/src/useIsMutating.ts
+++ b/packages/react-query/src/useIsMutating.ts
@@ -1,4 +1,4 @@
-'use client'
+import 'client-only'
 import * as React from 'react'
 import { useSyncExternalStore } from './useSyncExternalStore'
 
diff --git a/packages/react-query/src/useMutation.ts b/packages/react-query/src/useMutation.ts
index 0f10dbf74a..240a9f3f96 100644
--- a/packages/react-query/src/useMutation.ts
+++ b/packages/react-query/src/useMutation.ts
@@ -1,4 +1,4 @@
-'use client'
+import 'client-only'
 import * as React from 'react'
 import { useSyncExternalStore } from './useSyncExternalStore'
 
diff --git a/packages/react-query/src/useQueries.ts b/packages/react-query/src/useQueries.ts
index 46d4c3e5e1..c43dba916e 100644
--- a/packages/react-query/src/useQueries.ts
+++ b/packages/react-query/src/useQueries.ts
@@ -1,4 +1,4 @@
-'use client'
+import 'client-only'
 import * as React from 'react'
 import { useSyncExternalStore } from './useSyncExternalStore'
 
diff --git a/packages/react-query/src/useQuery.ts b/packages/react-query/src/useQuery.ts
index ae23e9016f..058b09d24c 100644
--- a/packages/react-query/src/useQuery.ts
+++ b/packages/react-query/src/useQuery.ts
@@ -1,4 +1,4 @@
-'use client'
+import 'client-only'
 import type { QueryFunction, QueryKey } from '@tanstack/query-core'
 import { parseQueryArgs, QueryObserver } from '@tanstack/query-core'
 import type {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c4939da2d3..ede7df5be2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -191,8 +191,8 @@ importers:
         specifier: ^2.70.2
         version: 2.78.1
       rollup-plugin-preserve-directives:
-        specifier: 0.1.0
-        version: 0.1.0(rollup@2.78.1)
+        specifier: 0.2.0
+        version: 0.2.0(rollup@2.78.1)
       rollup-plugin-size:
         specifier: ^0.2.2
         version: 0.2.2
@@ -1295,6 +1295,9 @@ importers:
       '@tanstack/query-core':
         specifier: workspace:*
         version: link:../query-core
+      client-only:
+        specifier: 0.0.1
+        version: 0.0.1
       react-native:
         specifier: '*'
         version: 0.64.3(@babel/core@7.19.1)(@babel/preset-env@7.18.6)(react@18.2.0)
@@ -1378,6 +1381,9 @@ importers:
       '@tanstack/query-persist-client-core':
         specifier: workspace:*
         version: link:../query-persist-client-core
+      client-only:
+        specifier: 0.0.1
+        version: 0.0.1
     devDependencies:
       '@tanstack/react-query':
         specifier: workspace:*
@@ -8275,6 +8281,10 @@ packages:
     engines: {node: '>= 10'}
     dev: false
 
+  /client-only@0.0.1:
+    resolution: {integrity: sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==}
+    dev: false
+
   /cliui@6.0.0:
     resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==}
     dependencies:
@@ -15322,11 +15332,12 @@ packages:
     dependencies:
       glob: 7.2.3
 
-  /rollup-plugin-preserve-directives@0.1.0(rollup@2.78.1):
-    resolution: {integrity: sha512-fgzIK3hwF/afa6L1Qdsvshn0JlCHZRx0Sh9l0jjUgz3VK0unMFuEB4uqL3Vdae4OXkn+MBYCeNEN9vm81IteiA==}
+  /rollup-plugin-preserve-directives@0.2.0(rollup@2.78.1):
+    resolution: {integrity: sha512-KUwbBaFvD1zFIDNnOkR+u64sSod3m0l6q46/SzTOa4GTQ6hp6w0FRr2u7x99YkY9qhlna5panmTmuLWeJ/2KWw==}
     peerDependencies:
       rollup: 2.x || 3.x
     dependencies:
+      magic-string: 0.30.0
       rollup: 2.78.1
     dev: true