diff --git a/examples/react-client/fishjam-chat/package.json b/examples/react-client/fishjam-chat/package.json
index e526a8ca..3619d5fb 100644
--- a/examples/react-client/fishjam-chat/package.json
+++ b/examples/react-client/fishjam-chat/package.json
@@ -33,7 +33,7 @@
     "react-dom": "^19.0.0",
     "react-hook-form": "^7.54.2",
     "sonner": "^2.0.1",
-    "tailwind-merge": "^2.5.5",
+    "tailwind-merge": "^3.0.2",
     "tailwindcss-animate": "^1.0.7"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 0e206ae4..204a705b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -862,7 +862,7 @@ __metadata:
     react-dom: "npm:^19.0.0"
     react-hook-form: "npm:^7.54.2"
     sonner: "npm:^2.0.1"
-    tailwind-merge: "npm:^2.5.5"
+    tailwind-merge: "npm:^3.0.2"
     tailwindcss: "npm:^3.4.17"
     tailwindcss-animate: "npm:^1.0.7"
     typescript: "npm:^5.8.2"
@@ -7850,10 +7850,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tailwind-merge@npm:^2.5.5":
-  version: 2.5.5
-  resolution: "tailwind-merge@npm:2.5.5"
-  checksum: 10c0/32614dd2b4ddd4fab070d5ec569e6da00e2b34269b9ac2f2ff16733cef29a076c8e2210fbfc1904d7983a8fdb6b3e63d18ca117645f21b12ca7bcf8fe3507241
+"tailwind-merge@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "tailwind-merge@npm:3.0.2"
+  checksum: 10c0/73f528345e5130e7690c5c57701155849ae4f0834e0a4bf56bc03e25d4563d45d4905ff9c487a7dce9efdfa18689a223e78365962105ad0e2f2d1226216c66ef
   languageName: node
   linkType: hard