Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -rb2cb7cc1837c1b6aac86a4c8d77cb2c2bf94a3ec -r55feed76aeb3720115a0869d70a1cf142b35ca9c
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision b2cb7cc1837c1b6aac86a4c8d77cb2c2bf94a3ec)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 55feed76aeb3720115a0869d70a1cf142b35ca9c)
@@ -372,28 +372,31 @@
                 || ( ALARM_ID_HD_AC_POWER_LOST == alarm )
                 || ( ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT == alarm ) )
         {
-            // Broadcast alarm and data if alarm not already active
-            if ( ( FALSE == alarmIsActive[ alarm ] ) && ( FALSE == alarmNoRetrigger ) )
+            if ( FALSE == alarmNoRetrigger )
             {
-                ALARM_TRIGGERED_PAYLOAD_T data;
-
-                data.alarm = (U32)alarm;
-                data.almDataType1 = (U32)alarmData1.dataType;
-                data.almData1 = alarmData1.data.uInt.data;
-                data.almDataType2 = (U32)alarmData2.dataType;
-                data.almData2 = alarmData2.data.uInt.data;
-                data.almPriority = ALARM_TABLE[ alarm ].alarmPriority;
-                data.almRank = ALARM_TABLE[ alarm ].alarmSubRank;
-                data.almClrTopOnly = ALARM_TABLE[ alarm ].alarmClearOnly;
-
-                broadcastData( MSG_ID_ALARM_TRIGGERED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&data, sizeof( ALARM_TRIGGERED_PAYLOAD_T ) );
-                // Send information for UI to log to treatment log
-                if ( ( TRUE == ALARM_TABLE[ alarm ].alarmTreatmentLog ) && ( MODE_TREA == getCurrentOperationMode() ) )
+                // Broadcast alarm and data if alarm not already active
+                if ( FALSE == alarmIsActive[ alarm ] )
                 {
-                    sendTreatmentLogAlarmEventData( alarm, alarmData1, alarmData2 );
-                }
-            }
-            activateAlarm( alarm );
+                    ALARM_TRIGGERED_PAYLOAD_T data;
+
+                    data.alarm = (U32)alarm;
+                    data.almDataType1 = (U32)alarmData1.dataType;
+                    data.almData1 = alarmData1.data.uInt.data;
+                    data.almDataType2 = (U32)alarmData2.dataType;
+                    data.almData2 = alarmData2.data.uInt.data;
+                    data.almPriority = ALARM_TABLE[ alarm ].alarmPriority;
+                    data.almRank = ALARM_TABLE[ alarm ].alarmSubRank;
+                    data.almClrTopOnly = ALARM_TABLE[ alarm ].alarmClearOnly;
+
+                    broadcastData( MSG_ID_ALARM_TRIGGERED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&data, sizeof( ALARM_TRIGGERED_PAYLOAD_T ) );
+                    // Send information for UI to log to treatment log
+                    if ( ( TRUE == ALARM_TABLE[ alarm ].alarmTreatmentLog ) && ( MODE_TREA == getCurrentOperationMode() ) )
+                    {
+                        sendTreatmentLogAlarmEventData( alarm, alarmData1, alarmData2 );
+                    }
+                }
+                activateAlarm( alarm );
+            }
         }
     }
     else