Index: firmware/App/Services/AlarmMgmtTD.c
===================================================================
diff -u -r512065f0a0c9ba2c335e8856b790e8448852fc52 -ra0d405d152c0f451ebf3c25e3c2cfa49a4db17cd
--- firmware/App/Services/AlarmMgmtTD.c	(.../AlarmMgmtTD.c)	(revision 512065f0a0c9ba2c335e8856b790e8448852fc52)
+++ firmware/App/Services/AlarmMgmtTD.c	(.../AlarmMgmtTD.c)	(revision a0d405d152c0f451ebf3c25e3c2cfa49a4db17cd)
@@ -113,9 +113,6 @@
     ALARM_ID_T             a;
     ALARM_BUTTON_BLOCKER_T b;
 
-    // Initialize alarm audio
-    initAlarmAudio();
-
     // Initialize common alarm mgmt unit
     initAlarmMgmt();
 
@@ -162,6 +159,10 @@
     alarmsBlockedTimer = 0;
     lastUserAlarmActionReceivedTime = 0;
     resumeBlockedByAlarmProperty = FALSE;
+
+    // Initialize alarm audio and lamp
+    initAlarmLamp();
+    initAlarmAudio();
 }
 
 /*********************************************************************//**
@@ -719,7 +720,7 @@
         }
     }
 
-//    sendActiveAlarmsList( activeAlarmPayload );
+//    TODO sendActiveAlarmsList( activeAlarmPayload );
 }
 
 /*********************************************************************//**