diff --git a/package.json b/package.json
index 780571e287..922fcd51e8 100644
--- a/package.json
+++ b/package.json
@@ -112,7 +112,7 @@
     "server-only": "^0.0.1",
     "socket.io-client": "4.8.1",
     "sonner": "1.7.4",
-    "tailwind-merge": "2.6.0",
+    "tailwind-merge": "3.0.1",
     "unidata.js": "0.8.0",
     "unified": "^11.0.5",
     "uniqolor": "1.1.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2979b9ca43..507b5fc2f4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -299,8 +299,8 @@ importers:
         specifier: 1.7.4
         version: 1.7.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       tailwind-merge:
-        specifier: 2.6.0
-        version: 2.6.0
+        specifier: 3.0.1
+        version: 3.0.1
       unidata.js:
         specifier: 0.8.0
         version: 0.8.0(bufferutil@4.0.9)(typescript@5.7.3)(zod@3.24.1)
@@ -6309,8 +6309,8 @@ packages:
   tailwind-merge@2.5.4:
     resolution: {integrity: sha512-0q8cfZHMu9nuYP/b5Shb7Y7Sh1B7Nnl5GqNr1U+n2p6+mybvRtayrQ+0042Z5byvTA8ihjlP8Odo8/VnHbZu4Q==}
 
-  tailwind-merge@2.6.0:
-    resolution: {integrity: sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==}
+  tailwind-merge@3.0.1:
+    resolution: {integrity: sha512-AvzE8FmSoXC7nC+oU5GlQJbip2UO7tmOhOfQyOmPhrStOGXHU08j8mZEHZ4BmCqY5dWTCo4ClWkNyRNx1wpT0g==}
 
   tailwind-scrollbar@3.1.0:
     resolution: {integrity: sha512-pmrtDIZeHyu2idTejfV59SbaJyvp1VRjYxAjZBH0jnyrPRo6HL1kD5Glz8VPagasqr6oAx6M05+Tuw429Z8jxg==}
@@ -14026,7 +14026,7 @@ snapshots:
 
   tailwind-merge@2.5.4: {}
 
-  tailwind-merge@2.6.0: {}
+  tailwind-merge@3.0.1: {}
 
   tailwind-scrollbar@3.1.0(tailwindcss@3.4.17):
     dependencies: