diff --git a/package.json b/package.json
index 88afe7072..bee6e598d 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
     "nyc": "15.1.0",
     "prettier": "3.0.3",
     "qs": "6.11.2",
-    "react-query": "3.39.3",
+    "@tanstack/react-query": "4.0.5",
     "standard-version": "9.5.0",
     "typescript": "5.1.6",
     "wait-on": "7.0.1"
diff --git a/yarn.lock b/yarn.lock
index fd30c1a76..edcd55ffb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2996,6 +2996,33 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@tanstack/query-core@npm:^4.0.0-beta.1":
+  version: 4.36.1
+  resolution: "@tanstack/query-core@npm:4.36.1"
+  checksum: 7c648872cd491bcab2aa4c18e0b7ca130c072f05c277a5876977fa3bfa87634bbfde46e9d249236587d78c39866889a02e4e202b478dc6074ff96093732ae56d
+  languageName: node
+  linkType: hard
+
+"@tanstack/react-query@npm:4.0.5":
+  version: 4.0.5
+  resolution: "@tanstack/react-query@npm:4.0.5"
+  dependencies:
+    "@tanstack/query-core": "npm:^4.0.0-beta.1"
+    "@types/use-sync-external-store": "npm:^0.0.3"
+    use-sync-external-store: "npm:^1.2.0"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+    react-native: "*"
+  peerDependenciesMeta:
+    react-dom:
+      optional: true
+    react-native:
+      optional: true
+  checksum: b4988ada9a2eb7a74f742fae328648bbe0da7fafa849b57ed4b0dc1263c46a4cc9b77a9de845b0077aa1364392978e8ff9386e5e634c53b9982d8a87f75304ff
+  languageName: node
+  linkType: hard
+
 "@testing-library/dom@npm:^9.0.0":
   version: 9.3.3
   resolution: "@testing-library/dom@npm:9.3.3"
@@ -3378,6 +3405,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/use-sync-external-store@npm:^0.0.3":
+  version: 0.0.3
+  resolution: "@types/use-sync-external-store@npm:0.0.3"
+  checksum: 161ddb8eec5dbe7279ac971531217e9af6b99f7783213566d2b502e2e2378ea19cf5e5ea4595039d730aa79d3d35c6567d48599f69773a02ffcff1776ec2a44e
+  languageName: node
+  linkType: hard
+
 "@types/uuid@npm:9.0.4":
   version: 9.0.4
   resolution: "@types/uuid@npm:9.0.4"
@@ -7216,6 +7250,7 @@ __metadata:
     "@mui/lab": "npm:5.0.0-alpha.140"
     "@mui/material": "npm:5.14.5"
     "@sentry/nextjs": "npm:7.77.0"
+    "@tanstack/react-query": "npm:4.0.5"
     "@testing-library/jest-dom": "npm:5.17.0"
     "@testing-library/react": "npm:14.0.0"
     "@testing-library/user-event": "npm:14.4.3"
@@ -7261,7 +7296,6 @@ __metadata:
     react-ga4: "npm:2.1.0"
     react-helmet: "npm:6.1.0"
     react-i18next: "npm:13.3.1"
-    react-query: "npm:3.39.3"
     react-router-dom: "npm:6.15.0"
     react-toastify: "npm:9.1.3"
     standard-version: "npm:9.5.0"
@@ -12174,7 +12208,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"use-sync-external-store@npm:1.2.0":
+"use-sync-external-store@npm:1.2.0, use-sync-external-store@npm:^1.2.0":
   version: 1.2.0
   resolution: "use-sync-external-store@npm:1.2.0"
   peerDependencies: