diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll
index 54a976eb..11e09892 100644
Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ
diff --git a/Step.Core/ThreadsHandler.cs b/Step.Core/ThreadsHandler.cs
index eac72e27..6ce2fe20 100644
--- a/Step.Core/ThreadsHandler.cs
+++ b/Step.Core/ThreadsHandler.cs
@@ -29,13 +29,13 @@ namespace Step.Core
             };
 
         private volatile static List<Thread> RunningThreadsList = new List<Thread>();
-        internal volatile static Dictionary<String, String> RunningThreadStatus = new Dictionary<String, String>();
+        internal volatile static Dictionary<string, string> RunningThreadStatus = new Dictionary<string, string>();
 
         public static void Start()
         {
             ThreadsFunctions.RestoreConnection();
 
-            //Start THread Network monitor
+            // Start Thread Network monitor
             Action Monitor = new Action(ThreadsFunctions.MonitorPanelPCResources);
             Thread t = new Thread(() => Monitor());
             t.Start();
diff --git a/Step.Model/DTOModels/AlarmModels/DTOAlarmHistoricModel.cs b/Step.Model/DTOModels/AlarmModels/DTOAlarmHistoricModel.cs
index 4d673513..a7cbeca7 100644
--- a/Step.Model/DTOModels/AlarmModels/DTOAlarmHistoricModel.cs
+++ b/Step.Model/DTOModels/AlarmModels/DTOAlarmHistoricModel.cs
@@ -42,7 +42,7 @@ namespace Step.Model.DTOModels.AlarmModels
             return new DTOAlarmHistoricModel()
             {
                 Id = obj.AlarmOccurrenceId,
-                AlarmId = obj.AlarmOccurrenceId,
+                AlarmId = obj.AlarmDescriptionId != null ? obj.AlarmDescriptionId.Value : obj.PlcMessageId.Value,
                 Title = obj.AlarmDescription == null ? "" : obj.AlarmDescription.Title,
                 // Description = obj.AlarmDescription == null ? "" : obj.AlarmDescription.Description,
                 Processes = processes,