diff --git a/package.json b/package.json
index 8b5c40f..87ec535 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "@trpc/next": "^11.4.3",
     "@trpc/react-query": "11.4.3",
     "@trpc/server": "11.4.3",
+    "@trpc/tanstack-react-query": "^11.4.3",
     "@types/ws": "^8.18.1",
     "chokidar": "^4.0.3",
     "dotenv": "^17.0.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2b58d6b..3235de5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -32,6 +32,9 @@ importers:
       '@trpc/server':
         specifier: 11.4.3
         version: 11.4.3(typescript@5.8.3)
+      '@trpc/tanstack-react-query':
+        specifier: ^11.4.3
+        version: 11.4.3(@tanstack/react-query@5.81.5(react@19.1.0))(@trpc/client@11.4.3(@trpc/server@11.4.3(typescript@5.8.3))(typescript@5.8.3))(@trpc/server@11.4.3(typescript@5.8.3))(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(typescript@5.8.3)
       '@types/ws':
         specifier: ^8.18.1
         version: 8.18.1
@@ -972,6 +975,16 @@ packages:
     peerDependencies:
       typescript: '>=5.7.2'
 
+  '@trpc/tanstack-react-query@11.4.3':
+    resolution: {integrity: sha512-aYPp12wE9IrakccGWoQU/waZuWr3FLw9RtagsqJmX9NKHpQOVzoDvHA1W0amwyTQSAfL98Bn5rWmD7KTdr5AWg==}
+    peerDependencies:
+      '@tanstack/react-query': ^5.80.3
+      '@trpc/client': 11.4.3
+      '@trpc/server': 11.4.3
+      react: '>=18.2.0'
+      react-dom: '>=18.2.0'
+      typescript: '>=5.7.2'
+
   '@tybys/wasm-util@0.9.0':
     resolution: {integrity: sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw==}
 
@@ -3631,6 +3644,15 @@ snapshots:
     dependencies:
       typescript: 5.8.3
 
+  '@trpc/tanstack-react-query@11.4.3(@tanstack/react-query@5.81.5(react@19.1.0))(@trpc/client@11.4.3(@trpc/server@11.4.3(typescript@5.8.3))(typescript@5.8.3))(@trpc/server@11.4.3(typescript@5.8.3))(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(typescript@5.8.3)':
+    dependencies:
+      '@tanstack/react-query': 5.81.5(react@19.1.0)
+      '@trpc/client': 11.4.3(@trpc/server@11.4.3(typescript@5.8.3))(typescript@5.8.3)
+      '@trpc/server': 11.4.3(typescript@5.8.3)
+      react: 19.1.0
+      react-dom: 19.1.0(react@19.1.0)
+      typescript: 5.8.3
+
   '@tybys/wasm-util@0.9.0':
     dependencies:
       tslib: 2.8.1
diff --git a/src/hooks/localCourse/quizHooks.ts b/src/hooks/localCourse/quizHooks.ts
index 63638da..74ef390 100644
--- a/src/hooks/localCourse/quizHooks.ts
+++ b/src/hooks/localCourse/quizHooks.ts
@@ -14,6 +14,7 @@ export const useQuizQuery = (moduleName: string, quizName: string) => {
 
 export const useQuizzesQueries = (moduleName: string) => {
   const { courseName } = useCourseContext();
+  // const trpc = usetrpc();
   return trpc.quiz.getAllQuizzes.useSuspenseQuery({
     courseName,
     moduleName,
diff --git a/src/services/serverFunctions/trpcClient.ts b/src/services/serverFunctions/trpcClient.ts
index 90cb11d..29e7dde 100644
--- a/src/services/serverFunctions/trpcClient.ts
+++ b/src/services/serverFunctions/trpcClient.ts
@@ -1,4 +1,7 @@
 import { createTRPCReact } from "@trpc/react-query";
+import { createTRPCContext } from '@trpc/tanstack-react-query';
 import { AppRouter } from "./router/app";
 
 export const trpc = createTRPCReact<AppRouter>();
+
+export const { TRPCProvider, useTRPC, useTRPCClient } = createTRPCContext<AppRouter>();
\ No newline at end of file