diff --git a/packages/solid-query/src/QueryClientProvider.tsx b/packages/solid-query/src/QueryClientProvider.tsx
index 4400d404eea..1ee3735df9f 100644
--- a/packages/solid-query/src/QueryClientProvider.tsx
+++ b/packages/solid-query/src/QueryClientProvider.tsx
@@ -7,11 +7,10 @@ export const QueryClientContext = createContext<QueryClient | undefined>(
 )
 
 export const useQueryClient = (queryClient?: QueryClient) => {
-  const client = useContext(QueryClientContext)
-
   if (queryClient) {
     return queryClient
   }
+  const client = useContext(QueryClientContext)
 
   if (!client) {
     throw new Error('No QueryClient set, use QueryClientProvider to set one')
diff --git a/packages/solid-query/src/__tests__/QueryClientProvider.test.tsx b/packages/solid-query/src/__tests__/QueryClientProvider.test.tsx
index a6276227ba2..9ee34dd604b 100644
--- a/packages/solid-query/src/__tests__/QueryClientProvider.test.tsx
+++ b/packages/solid-query/src/__tests__/QueryClientProvider.test.tsx
@@ -161,4 +161,21 @@ describe('QueryClientProvider', () => {
       consoleMock.mockRestore()
     })
   })
+
+  it('should not throw an error if user provides custom query client', () => {
+    const consoleMock = vi
+      .spyOn(console, 'error')
+      .mockImplementation(() => undefined)
+
+    function Page() {
+      const client = createQueryClient()
+      useQueryClient(client)
+      return null
+    }
+
+    render(() => <Page />)
+    expect(consoleMock).not.toHaveBeenCalled()
+
+    consoleMock.mockRestore()
+  })
 })
diff --git a/packages/svelte-query/src/useQueryClient.ts b/packages/svelte-query/src/useQueryClient.ts
index 4e8b2bcf943..67439559768 100644
--- a/packages/svelte-query/src/useQueryClient.ts
+++ b/packages/svelte-query/src/useQueryClient.ts
@@ -2,11 +2,6 @@ import type { QueryClient } from '@tanstack/query-core'
 import { getQueryClientContext } from './context'
 
 export function useQueryClient(queryClient?: QueryClient): QueryClient {
-  const client = getQueryClientContext()
-
-  if (queryClient) {
-    return queryClient
-  }
-
-  return client
+  if (queryClient) return queryClient
+  return getQueryClientContext()
 }