diff --git a/packages/query-core/src/index.ts b/packages/query-core/src/index.ts
index 82c21125..6a340aa8 100644
--- a/packages/query-core/src/index.ts
+++ b/packages/query-core/src/index.ts
@@ -60,10 +60,10 @@ export function createQueryHooksHelpers
() {
function handleSubscription(
client: rspc.Client
,
path: string[],
- input: unknown,
+ input: unknown | tanstack.SkipToken,
opts?: () => SubscriptionOptions | undefined,
): undefined | (() => void) {
- if (!(opts?.()?.enabled ?? true)) return;
+ if (!(opts?.()?.enabled ?? true) || input === tanstack.skipToken) return;
let isStopped = false;
diff --git a/packages/react-query/src/hooks.tsx b/packages/react-query/src/hooks.tsx
index d2782bf6..7734c20f 100644
--- a/packages/react-query/src/hooks.tsx
+++ b/packages/react-query/src/hooks.tsx
@@ -47,7 +47,7 @@ export function createHooks() {
function useSubscription(
path: string[],
...[input, opts]: [
- unknown,
+ unknown | tanstack.SkipToken,
queryCore.SubscriptionOptions | undefined,
]
) {
diff --git a/packages/react-query/src/types.ts b/packages/react-query/src/types.ts
index 838582b7..c63adeb1 100644
--- a/packages/react-query/src/types.ts
+++ b/packages/react-query/src/types.ts
@@ -80,7 +80,7 @@ export type ProcedureProxyMethods<
: P["variant"] extends "subscription"
? {
useSubscription(
- input: P["input"],
+ input: P["input"] | tanstack.SkipToken,
opts?: Partial<
rspc.SubscriptionObserver, unknown>
>,
diff --git a/packages/solid-query/src/hooks.tsx b/packages/solid-query/src/hooks.tsx
index 3c412fba..f0fbe77d 100644
--- a/packages/solid-query/src/hooks.tsx
+++ b/packages/solid-query/src/hooks.tsx
@@ -57,7 +57,7 @@ export function createHooks() {
function createSubscription(
path: string[],
...[input, opts]: [
- solid.Accessor,
+ solid.Accessor,
opts:
| solid.Accessor>
| undefined,
diff --git a/packages/solid-query/src/types.ts b/packages/solid-query/src/types.ts
index 2d8ed063..24bae23b 100644
--- a/packages/solid-query/src/types.ts
+++ b/packages/solid-query/src/types.ts
@@ -92,7 +92,7 @@ export type ProcedureProxyMethods<
: P["variant"] extends "subscription"
? {
createSubscription(
- input: solid.Accessor,
+ input: solid.Accessor
,
opts?: solid.Accessor<
Partial<
rspc.SubscriptionObserver, unknown>
diff --git a/packages/svelte-query/src/hooks.ts b/packages/svelte-query/src/hooks.ts
index 840f5c25..aea6291d 100644
--- a/packages/svelte-query/src/hooks.ts
+++ b/packages/svelte-query/src/hooks.ts
@@ -83,7 +83,7 @@ export function createHooks() {
function createSubscription(
path: string[],
...[input, opts]: [
- tanstack.StoreOrVal,
+ tanstack.StoreOrVal,
opts:
| tanstack.StoreOrVal>
| undefined,
diff --git a/packages/svelte-query/src/types.ts b/packages/svelte-query/src/types.ts
index bcb5ab97..53b69cad 100644
--- a/packages/svelte-query/src/types.ts
+++ b/packages/svelte-query/src/types.ts
@@ -84,7 +84,7 @@ export type ProcedureProxyMethods<
: P["variant"] extends "subscription"
? {
createSubscription(
- input: tanstack.StoreOrVal,
+ input: tanstack.StoreOrVal
,
opts?: tanstack.StoreOrVal<
Partial<
rspc.SubscriptionObserver, unknown>