diff --git a/src/core/queryClient.ts b/src/core/queryClient.ts
index 1656b955e2..4ac631d820 100644
--- a/src/core/queryClient.ts
+++ b/src/core/queryClient.ts
@@ -148,19 +148,19 @@ export class QueryClient {
 
   setQueriesData<TData>(
     queryKey: QueryKey,
-    updater: Updater<TData | undefined, TData>,
+    updater: Updater<TData | undefined, TData | undefined>,
     options?: SetDataOptions
-  ): [QueryKey, TData][]
+  ): [QueryKey, TData | undefined][]
 
   setQueriesData<TData>(
     filters: QueryFilters,
-    updater: Updater<TData | undefined, TData>,
+    updater: Updater<TData | undefined, TData | undefined>,
     options?: SetDataOptions
-  ): [QueryKey, TData][]
+  ): [QueryKey, TData | undefined][]
 
   setQueriesData<TData>(
     queryKeyOrFilters: QueryKey | QueryFilters,
-    updater: Updater<TData | undefined, TData>,
+    updater: Updater<TData | undefined, TData | undefined>,
     options?: SetDataOptions
   ): [QueryKey, TData | undefined][] {
     return notifyManager.batch(() =>
diff --git a/src/core/tests/queryClient.test.tsx b/src/core/tests/queryClient.test.tsx
index 3675f6c283..c604a5ab59 100644
--- a/src/core/tests/queryClient.test.tsx
+++ b/src/core/tests/queryClient.test.tsx
@@ -386,9 +386,8 @@ describe('queryClient', () => {
       queryClient.setQueryData(['key', 1], 1)
       queryClient.setQueryData(['key', 2], 2)
 
-      const result = queryClient.setQueriesData<number>(
-        ['key'],
-        old => old! + 5
+      const result = queryClient.setQueriesData<number>(['key'], old =>
+        old ? old + 5 : undefined
       )
 
       expect(result).toEqual([