diff --git a/src/Client/ZB.MOM.WW.OtOpcUa.Client.UI/ViewModels/AlarmsViewModel.cs b/src/Client/ZB.MOM.WW.OtOpcUa.Client.UI/ViewModels/AlarmsViewModel.cs
index 50fe5159..510ffb7e 100644
--- a/src/Client/ZB.MOM.WW.OtOpcUa.Client.UI/ViewModels/AlarmsViewModel.cs
+++ b/src/Client/ZB.MOM.WW.OtOpcUa.Client.UI/ViewModels/AlarmsViewModel.cs
@@ -209,7 +209,13 @@ public partial class AlarmsViewModel : ObservableObject
         {
             var result = await _service.ShelveAlarmAsync(alarm.ConditionNodeId, kind, durationSeconds);
             if (Opc.Ua.StatusCode.IsGood(result))
-                return (true, $"Alarm {kind.ToString().ToLowerInvariant()} succeeded.");
+                return (true, kind switch
+                {
+                    ShelveKind.OneShot => "Alarm shelved (one-shot).",
+                    ShelveKind.Timed => $"Alarm shelved for {durationSeconds:0}s.",
+                    ShelveKind.Unshelve => "Alarm unshelved.",
+                    _ => "Shelve succeeded."
+                });
             return (false, $"Shelve failed: {Helpers.StatusCodeFormatter.Format(result)}");
         }
         catch (Exception ex)