diff --git a/packages/frontend/admin/package.json b/packages/frontend/admin/package.json
index 0397242891..d9a2368b69 100644
--- a/packages/frontend/admin/package.json
+++ b/packages/frontend/admin/package.json
@@ -57,7 +57,7 @@
     "clsx": "^2.1.1",
     "cross-env": "^7.0.3",
     "shadcn-ui": "^0.9.4",
-    "tailwind-merge": "^2.5.5",
+    "tailwind-merge": "^3.0.0",
     "tailwindcss": "^3.4.16",
     "tailwindcss-animate": "^1.0.7"
   },
diff --git a/yarn.lock b/yarn.lock
index 6b819a927e..9e1280e626 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -207,7 +207,7 @@ __metadata:
     shadcn-ui: "npm:^0.9.4"
     sonner: "npm:^1.7.1"
     swr: "npm:^2.2.5"
-    tailwind-merge: "npm:^2.5.5"
+    tailwind-merge: "npm:^3.0.0"
     tailwindcss: "npm:^3.4.16"
     tailwindcss-animate: "npm:^1.0.7"
     vaul: "npm:^1.1.1"
@@ -33563,10 +33563,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tailwind-merge@npm:^2.5.5":
-  version: 2.6.0
-  resolution: "tailwind-merge@npm:2.6.0"
-  checksum: 10/a84f49d6f2cfb18ba06dc51b446b69f6b42cedcb9c9fa4e7c5f931b56e739870e513339e02b348b43f44011fa4852f02f72658a3f3e066e5101b09fc28644210
+"tailwind-merge@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "tailwind-merge@npm:3.0.1"
+  checksum: 10/bad61589b78530ce1d49a369b089ff606ed56d7d5aa67f57c04144751abbee3d844652a22595bfa21a4509d0d06946a9bc8c7e9ef74cd5fcf10c51925a2f14af
   languageName: node
   linkType: hard