diff --git a/custom_components/mikrotik_router/switch.py b/custom_components/mikrotik_router/switch.py
index 8b8107c..b183ff2 100644
--- a/custom_components/mikrotik_router/switch.py
+++ b/custom_components/mikrotik_router/switch.py
@@ -406,6 +406,9 @@ class MikrotikControllerMangleSwitch(MikrotikControllerSwitch):
     @property
     def name(self) -> str:
         """Return the name of the Mangle switch."""
+        if self._data["comment"]:
+            return f"{self._inst} Mangle {self._data['comment']}"
+
         return f"{self._inst} Mangle {self._data['name']}"
 
     @property