diff --git a/apps/web/package.json b/apps/web/package.json
index 69719d925..26c4ca73a 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -55,8 +55,8 @@
     "@marsidev/react-turnstile": "^0.7.1",
     "@radix-ui/react-icons": "^1.3.0",
     "@supabase/supabase-js": "^2.44.2",
-    "@tanstack/react-query": "5.49.2",
-    "@tanstack/react-query-next-experimental": "^5.49.2",
+    "@tanstack/react-query": "5.50.1",
+    "@tanstack/react-query-next-experimental": "^5.50.1",
     "@tanstack/react-table": "^8.19.2",
     "date-fns": "^3.6.0",
     "lucide-react": "^0.400.0",
diff --git a/packages/email-templates/package.json b/packages/email-templates/package.json
index e7b539d80..e4bfe8a5f 100644
--- a/packages/email-templates/package.json
+++ b/packages/email-templates/package.json
@@ -13,7 +13,7 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@react-email/components": "0.0.20"
+    "@react-email/components": "0.0.21"
   },
   "devDependencies": {
     "@kit/eslint-config": "workspace:*",
diff --git a/packages/features/accounts/package.json b/packages/features/accounts/package.json
index a0276e631..4f804809e 100644
--- a/packages/features/accounts/package.json
+++ b/packages/features/accounts/package.json
@@ -35,7 +35,7 @@
     "@kit/ui": "workspace:^",
     "@radix-ui/react-icons": "^1.3.0",
     "@supabase/supabase-js": "^2.44.2",
-    "@tanstack/react-query": "5.49.2",
+    "@tanstack/react-query": "5.50.1",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "lucide-react": "^0.400.0",
diff --git a/packages/features/admin/package.json b/packages/features/admin/package.json
index e6dbe9b4f..98ae9dd95 100644
--- a/packages/features/admin/package.json
+++ b/packages/features/admin/package.json
@@ -22,7 +22,7 @@
     "@makerkit/data-loader-supabase-core": "^0.0.8",
     "@makerkit/data-loader-supabase-nextjs": "^1.2.3",
     "@supabase/supabase-js": "^2.44.2",
-    "@tanstack/react-query": "5.49.2",
+    "@tanstack/react-query": "5.50.1",
     "@tanstack/react-table": "^8.19.2",
     "@types/react": "^18.3.3",
     "lucide-react": "^0.400.0",
diff --git a/packages/features/auth/package.json b/packages/features/auth/package.json
index 3ac368025..3fd280111 100644
--- a/packages/features/auth/package.json
+++ b/packages/features/auth/package.json
@@ -29,7 +29,7 @@
     "@marsidev/react-turnstile": "^0.7.1",
     "@radix-ui/react-icons": "^1.3.0",
     "@supabase/supabase-js": "^2.44.2",
-    "@tanstack/react-query": "5.49.2",
+    "@tanstack/react-query": "5.50.1",
     "@types/react": "^18.3.3",
     "lucide-react": "^0.400.0",
     "next": "14.2.4",
diff --git a/packages/features/notifications/package.json b/packages/features/notifications/package.json
index cb8fefa79..8faa1e191 100644
--- a/packages/features/notifications/package.json
+++ b/packages/features/notifications/package.json
@@ -21,7 +21,7 @@
     "@kit/tsconfig": "workspace:*",
     "@kit/ui": "workspace:*",
     "@supabase/supabase-js": "^2.44.2",
-    "@tanstack/react-query": "5.49.2",
+    "@tanstack/react-query": "5.50.1",
     "@types/react": "^18.3.3",
     "lucide-react": "^0.400.0",
     "react": "18.3.1",
diff --git a/packages/features/team-accounts/package.json b/packages/features/team-accounts/package.json
index e187dcf93..c49ed373a 100644
--- a/packages/features/team-accounts/package.json
+++ b/packages/features/team-accounts/package.json
@@ -33,7 +33,7 @@
     "@kit/tsconfig": "workspace:*",
     "@kit/ui": "workspace:^",
     "@supabase/supabase-js": "^2.44.2",
-    "@tanstack/react-query": "5.49.2",
+    "@tanstack/react-query": "5.50.1",
     "@tanstack/react-table": "^8.19.2",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index 56ca70cae..2dd7f4934 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -21,7 +21,7 @@
     "@kit/shared": "workspace:^",
     "@kit/tailwind-config": "workspace:*",
     "@kit/tsconfig": "workspace:*",
-    "@tanstack/react-query": "5.49.2",
+    "@tanstack/react-query": "5.50.1",
     "react-i18next": "^14.1.2"
   },
   "dependencies": {
diff --git a/packages/supabase/package.json b/packages/supabase/package.json
index e3fc6e36c..d1108c529 100644
--- a/packages/supabase/package.json
+++ b/packages/supabase/package.json
@@ -29,7 +29,7 @@
     "@supabase/gotrue-js": "2.64.3",
     "@supabase/ssr": "^0.4.0",
     "@supabase/supabase-js": "^2.44.2",
-    "@tanstack/react-query": "5.49.2",
+    "@tanstack/react-query": "5.50.1",
     "@types/react": "^18.3.3",
     "next": "14.2.4",
     "react": "18.3.1",
diff --git a/packages/ui/package.json b/packages/ui/package.json
index d31913dc1..e24bf715d 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -41,7 +41,7 @@
     "@kit/tailwind-config": "workspace:*",
     "@kit/tsconfig": "workspace:*",
     "@radix-ui/react-icons": "^1.3.0",
-    "@tanstack/react-query": "5.49.2",
+    "@tanstack/react-query": "5.50.1",
     "@tanstack/react-table": "^8.19.2",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 98735f225..08bb72db7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -110,7 +110,7 @@ importers:
         version: 0.0.8(@supabase/postgrest-js@1.15.7)(@supabase/supabase-js@2.44.2)
       '@makerkit/data-loader-supabase-nextjs':
         specifier: ^1.2.3
-        version: 1.2.3(@supabase/postgrest-js@1.15.7)(@supabase/supabase-js@2.44.2)(@tanstack/react-query@5.49.2(react@18.3.1))(next@14.2.4(@opentelemetry/api@1.9.0)(@playwright/test@1.45.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)
+        version: 1.2.3(@supabase/postgrest-js@1.15.7)(@supabase/supabase-js@2.44.2)(@tanstack/react-query@5.50.1(react@18.3.1))(next@14.2.4(@opentelemetry/api@1.9.0)(@playwright/test@1.45.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)
       '@marsidev/react-turnstile':
         specifier: ^0.7.1
         version: 0.7.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -121,11 +121,11 @@ importers:
         specifier: ^2.44.2
         version: 2.44.2
       '@tanstack/react-query':
-        specifier: 5.49.2
-        version: 5.49.2(react@18.3.1)
+        specifier: 5.50.1
+        version: 5.50.1(react@18.3.1)
       '@tanstack/react-query-next-experimental':
-        specifier: ^5.49.2
-        version: 5.49.2(@tanstack/react-query@5.49.2(react@18.3.1))(next@14.2.4(@opentelemetry/api@1.9.0)(@playwright/test@1.45.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)
+        specifier: ^5.50.1
+        version: 5.50.1(@tanstack/react-query@5.50.1(react@18.3.1))(next@14.2.4(@opentelemetry/api@1.9.0)(@playwright/test@1.45.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)
       '@tanstack/react-table':
         specifier: ^8.19.2
         version: 8.19.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -521,8 +521,8 @@ importers:
   packages/email-templates:
     dependencies:
       '@react-email/components':
-        specifier: 0.0.20
-        version: 0.0.20(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        specifier: 0.0.21
+        version: 0.0.21(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
     devDependencies:
       '@kit/eslint-config':
         specifier: workspace:*
@@ -592,8 +592,8 @@ importers:
         specifier: ^2.44.2
         version: 2.44.2
       '@tanstack/react-query':
-        specifier: 5.49.2
-        version: 5.49.2(react@18.3.1)
+        specifier: 5.50.1
+        version: 5.50.1(react@18.3.1)
       '@types/react':
         specifier: ^18.3.3
         version: 18.3.3
@@ -662,13 +662,13 @@ importers:
         version: 0.0.8(@supabase/postgrest-js@1.15.7)(@supabase/supabase-js@2.44.2)
       '@makerkit/data-loader-supabase-nextjs':
         specifier: ^1.2.3
-        version: 1.2.3(@supabase/postgrest-js@1.15.7)(@supabase/supabase-js@2.44.2)(@tanstack/react-query@5.49.2(react@18.3.1))(next@14.2.4(@opentelemetry/api@1.9.0)(@playwright/test@1.45.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)
+        version: 1.2.3(@supabase/postgrest-js@1.15.7)(@supabase/supabase-js@2.44.2)(@tanstack/react-query@5.50.1(react@18.3.1))(next@14.2.4(@opentelemetry/api@1.9.0)(@playwright/test@1.45.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)
       '@supabase/supabase-js':
         specifier: ^2.44.2
         version: 2.44.2
       '@tanstack/react-query':
-        specifier: 5.49.2
-        version: 5.49.2(react@18.3.1)
+        specifier: 5.50.1
+        version: 5.50.1(react@18.3.1)
       '@tanstack/react-table':
         specifier: ^8.19.2
         version: 8.19.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -730,8 +730,8 @@ importers:
         specifier: ^2.44.2
         version: 2.44.2
       '@tanstack/react-query':
-        specifier: 5.49.2
-        version: 5.49.2(react@18.3.1)
+        specifier: 5.50.1
+        version: 5.50.1(react@18.3.1)
       '@types/react':
         specifier: ^18.3.3
         version: 18.3.3
@@ -778,8 +778,8 @@ importers:
         specifier: ^2.44.2
         version: 2.44.2
       '@tanstack/react-query':
-        specifier: 5.49.2
-        version: 5.49.2(react@18.3.1)
+        specifier: 5.50.1
+        version: 5.50.1(react@18.3.1)
       '@types/react':
         specifier: ^18.3.3
         version: 18.3.3
@@ -848,8 +848,8 @@ importers:
         specifier: ^2.44.2
         version: 2.44.2
       '@tanstack/react-query':
-        specifier: 5.49.2
-        version: 5.49.2(react@18.3.1)
+        specifier: 5.50.1
+        version: 5.50.1(react@18.3.1)
       '@tanstack/react-table':
         specifier: ^8.19.2
         version: 8.19.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -918,8 +918,8 @@ importers:
         specifier: workspace:*
         version: link:../../tooling/typescript
       '@tanstack/react-query':
-        specifier: 5.49.2
-        version: 5.49.2(react@18.3.1)
+        specifier: 5.50.1
+        version: 5.50.1(react@18.3.1)
       react-i18next:
         specifier: ^14.1.2
         version: 14.1.2(i18next@23.11.5)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -1144,8 +1144,8 @@ importers:
         specifier: ^2.44.2
         version: 2.44.2
       '@tanstack/react-query':
-        specifier: 5.49.2
-        version: 5.49.2(react@18.3.1)
+        specifier: 5.50.1
+        version: 5.50.1(react@18.3.1)
       '@types/react':
         specifier: ^18.3.3
         version: 18.3.3
@@ -1256,8 +1256,8 @@ importers:
         specifier: ^1.3.0
         version: 1.3.0(react@18.3.1)
       '@tanstack/react-query':
-        specifier: 5.49.2
-        version: 5.49.2(react@18.3.1)
+        specifier: 5.50.1
+        version: 5.50.1(react@18.3.1)
       '@tanstack/react-table':
         specifier: ^8.19.2
         version: 8.19.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -3209,8 +3209,8 @@ packages:
     peerDependencies:
       react: 18.3.1
 
-  '@react-email/code-block@0.0.4':
-    resolution: {integrity: sha512-xjVLi/9dFNJ70N7hYme+21eQWa3b9/kgp4V+FKQJkQCuIMobxPRCIGM5jKD/0Vo2OqrE5chYv/dkg/aP8a8sPg==}
+  '@react-email/code-block@0.0.5':
+    resolution: {integrity: sha512-mmInpZsSIkNaYC1y40/S0XXrIqbTzrpllP6J1JMJuDOBG8l5T7pNl4V+gwfsSTvy9hVsuzQFmhHK8kVb1UXv3A==}
     engines: {node: '>=18.0.0'}
     peerDependencies:
       react: 18.3.1
@@ -3227,8 +3227,8 @@ packages:
     peerDependencies:
       react: 18.3.1
 
-  '@react-email/components@0.0.20':
-    resolution: {integrity: sha512-9grJ90RLv5ZPXq07YyQZ9A/OaM6QvGOD41Pl31I6s3UjFp7Jmxqr0wSUpuPhl0eKWriJU42E48okt4ugz29/hQ==}
+  '@react-email/components@0.0.21':
+    resolution: {integrity: sha512-fwGfH7FF+iuq+IdPcbEO5HoF0Pakk9big+fFW9+3kiyvbSNuo8Io1rhPTMLd8q41XomN4g7mgWovdAeS/8PHrA==}
     engines: {node: '>=18.0.0'}
     peerDependencies:
       react: 18.3.1
@@ -3804,18 +3804,18 @@ packages:
     resolution: {integrity: sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==}
     engines: {node: '>=14.16'}
 
-  '@tanstack/query-core@5.49.1':
-    resolution: {integrity: sha512-JnC9ndmD1KKS01Rt/ovRUB1tmwO7zkyXAyIxN9mznuJrcNtOrkmOnQqdJF2ib9oHzc2VxHomnEG7xyfo54Npkw==}
+  '@tanstack/query-core@5.50.1':
+    resolution: {integrity: sha512-lpfhKPrJlyV2DSVcQb/HuozH3Av3kws4ge22agx+lNGpFkS4vLZ7St0l3GLwlAD+bqB+qXGex3JdRKUNtMviEQ==}
 
-  '@tanstack/react-query-next-experimental@5.49.2':
-    resolution: {integrity: sha512-GgGQa81VDT8XPuU0geAOP6oFQCt2OcV5aP3c8RJW6yNSM9ZrdBgJzgJHxDFkwJPlLKqvhNujDWM9dkz5Vcj84g==}
+  '@tanstack/react-query-next-experimental@5.50.1':
+    resolution: {integrity: sha512-AgMhRPYbNRvol44orcKcf1KToGJcHTNDcKp7RRkEZ7FBNQZoQeNnWmKQBjaEgrC52mbj6rf5QOy1B2FqFZzQDw==}
     peerDependencies:
-      '@tanstack/react-query': ^5.49.2
+      '@tanstack/react-query': ^5.50.1
       next: ^13 || ^14 || ^15
       react: 18.3.1
 
-  '@tanstack/react-query@5.49.2':
-    resolution: {integrity: sha512-6rfwXDK9BvmHISbNFuGd+wY3P44lyW7lWiA9vIFGT/T0P9aHD1VkjTvcM4SDAIbAQ9ygEZZoLt7dlU1o3NjMVA==}
+  '@tanstack/react-query@5.50.1':
+    resolution: {integrity: sha512-s0DW3rVBDPReDDovUjVqItVa3R2nPfUANK9nqGvarO2DwTiY9U4EBTsqizMxItRCoGgK5apeM7D3mxlHrSKpdQ==}
     peerDependencies:
       react: 18.3.1
 
@@ -8456,11 +8456,11 @@ snapshots:
       '@supabase/supabase-js': 2.44.2
       ts-case-convert: 2.0.7
 
-  '@makerkit/data-loader-supabase-nextjs@1.2.3(@supabase/postgrest-js@1.15.7)(@supabase/supabase-js@2.44.2)(@tanstack/react-query@5.49.2(react@18.3.1))(next@14.2.4(@opentelemetry/api@1.9.0)(@playwright/test@1.45.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)':
+  '@makerkit/data-loader-supabase-nextjs@1.2.3(@supabase/postgrest-js@1.15.7)(@supabase/supabase-js@2.44.2)(@tanstack/react-query@5.50.1(react@18.3.1))(next@14.2.4(@opentelemetry/api@1.9.0)(@playwright/test@1.45.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)':
     dependencies:
       '@makerkit/data-loader-supabase-core': 0.0.8(@supabase/postgrest-js@1.15.7)(@supabase/supabase-js@2.44.2)
       '@supabase/supabase-js': 2.44.2
-      '@tanstack/react-query': 5.49.2(react@18.3.1)
+      '@tanstack/react-query': 5.50.1(react@18.3.1)
       next: 14.2.4(@babel/core@7.24.7)(@opentelemetry/api@1.9.0)(@playwright/test@1.45.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       react: 18.3.1
     transitivePeerDependencies:
@@ -10267,7 +10267,7 @@ snapshots:
     dependencies:
       react: 18.3.1
 
-  '@react-email/code-block@0.0.4(react@18.3.1)':
+  '@react-email/code-block@0.0.5(react@18.3.1)':
     dependencies:
       prismjs: 1.29.0
       react: 18.3.1
@@ -10280,11 +10280,11 @@ snapshots:
     dependencies:
       react: 18.3.1
 
-  '@react-email/components@0.0.20(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@react-email/components@0.0.21(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
       '@react-email/body': 0.0.8(react@18.3.1)
       '@react-email/button': 0.0.15(react@18.3.1)
-      '@react-email/code-block': 0.0.4(react@18.3.1)
+      '@react-email/code-block': 0.0.5(react@18.3.1)
       '@react-email/code-inline': 0.0.2(react@18.3.1)
       '@react-email/column': 0.0.10(react@18.3.1)
       '@react-email/container': 0.0.12(react@18.3.1)
@@ -11053,17 +11053,17 @@ snapshots:
     dependencies:
       defer-to-connect: 2.0.1
 
-  '@tanstack/query-core@5.49.1': {}
+  '@tanstack/query-core@5.50.1': {}
 
-  '@tanstack/react-query-next-experimental@5.49.2(@tanstack/react-query@5.49.2(react@18.3.1))(next@14.2.4(@opentelemetry/api@1.9.0)(@playwright/test@1.45.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)':
+  '@tanstack/react-query-next-experimental@5.50.1(@tanstack/react-query@5.50.1(react@18.3.1))(next@14.2.4(@opentelemetry/api@1.9.0)(@playwright/test@1.45.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@tanstack/react-query': 5.49.2(react@18.3.1)
+      '@tanstack/react-query': 5.50.1(react@18.3.1)
       next: 14.2.4(@babel/core@7.24.7)(@opentelemetry/api@1.9.0)(@playwright/test@1.45.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       react: 18.3.1
 
-  '@tanstack/react-query@5.49.2(react@18.3.1)':
+  '@tanstack/react-query@5.50.1(react@18.3.1)':
     dependencies:
-      '@tanstack/query-core': 5.49.1
+      '@tanstack/query-core': 5.50.1
       react: 18.3.1
 
   '@tanstack/react-table@8.19.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
@@ -12834,7 +12834,7 @@ snapshots:
     dependencies:
       foreground-child: 3.2.1
       jackspeak: 3.4.0
-      minimatch: 9.0.4
+      minimatch: 9.0.5
       minipass: 7.1.2
       package-json-from-dist: 1.0.0
       path-scurry: 1.11.1