diff --git a/package.json b/package.json
index 7d010d5c..88a9e17f 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "prism-react-renderer": "1.3.5",
     "react-markdown": "8.0.7",
     "react-mentions": "4.4.10",
-    "react-query": "3.39.3",
+    "@tanstack/react-query": "4.0.5",
     "remark-breaks": "3.0.3",
     "remark-gfm": "3.0.1",
     "tsc-alias": "1.8.7"
diff --git a/yarn.lock b/yarn.lock
index c1327f19..5c6eb116 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4983,6 +4983,7 @@ __metadata:
     "@mui/icons-material": 5.13.7
     "@mui/lab": 5.0.0-alpha.135
     "@mui/material": 5.13.7
+    "@tanstack/react-query": 4.0.5
     "@trivago/prettier-plugin-sort-imports": 4.2.0
     "@types/jest": 29.5.3
     "@types/lodash.groupby": 4.6.8
@@ -5019,7 +5020,6 @@ __metadata:
     react-i18next: 12.3.1
     react-markdown: 8.0.7
     react-mentions: 4.4.10
-    react-query: 3.39.3
     react-router-dom: 6.14.2
     react-scripts: 5.0.1
     remark-breaks: 3.0.3
@@ -7347,6 +7347,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: 47672094da20d89402d9fe03bb7b0462be73a76ff9ca715169738bc600a719d064d106d083a8eedae22a2c22de22f87d5eb5d31ef447aba771d9190f2117ed10
+  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": ^4.0.0-beta.1
+    "@types/use-sync-external-store": ^0.0.3
+    use-sync-external-store: ^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: c555d2dce19a57ba254855f19a06e4968ae21a08d5cd8890635d9771f77d5aef2e889b23a300b25d1e09b52edeb3fdf7b4579679c43cf9449692463a45a689b8
+  languageName: node
+  linkType: hard
+
 "@tootallnate/once@npm:1":
   version: 1.1.2
   resolution: "@tootallnate/once@npm:1.1.2"
@@ -7996,6 +8023,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.2":
   version: 9.0.2
   resolution: "@types/uuid@npm:9.0.2"
@@ -22368,6 +22402,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"use-sync-external-store@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "use-sync-external-store@npm:1.2.0"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+  checksum: 5c639e0f8da3521d605f59ce5be9e094ca772bd44a4ce7322b055a6f58eeed8dda3c94cabd90c7a41fb6fa852210092008afe48f7038792fd47501f33299116a
+  languageName: node
+  linkType: hard
+
 "util-deprecate@npm:^1.0.1, util-deprecate@npm:^1.0.2, util-deprecate@npm:~1.0.1":
   version: 1.0.2
   resolution: "util-deprecate@npm:1.0.2"