diff --git a/src/AlarmHandler.cpp b/src/AlarmHandler.cpp
index 149793d626ecfb8e3d55ee8cbfa8ea9a7ca0372a..101bd251c4dd0f8f2376f4b5db73c39aca78ee75 100644
--- a/src/AlarmHandler.cpp
+++ b/src/AlarmHandler.cpp
@@ -5256,7 +5256,7 @@ void AlarmHandler::prepare_alarm_attr()
 					aid->stat = S_ERROR;
 					aid->ack = NOT_ACK;
 					aid->ts = ai->second.ts;
-					aid->msg = ai->second.msg;
+					aid->msg = it->second.ex_desc;//tmp_ex.str();//ai->second.msg;
 					aid->url = ai->second.url;
 				}
 				aid->grp = ai->second.grp;
@@ -5276,6 +5276,7 @@ void AlarmHandler::prepare_alarm_attr()
 			} else {
 				alarm_t at = ai->second;
 				at.stat = S_ERROR;
+				at.msg = it->second.ex_desc;//tmp_ex.str();//ai->second.msg;
 				/*
 				 * not found: new "alarmed" item
 				 */