Index: sources/view/hd/alarm/VAlarmStatus.cpp
===================================================================
diff -u -r19092150c9343b729ad87be76805300417bfd68c -rb42479c75add1af6281a6f7d8e6090117eaa55a9
--- sources/view/hd/alarm/VAlarmStatus.cpp	(.../VAlarmStatus.cpp)	(revision 19092150c9343b729ad87be76805300417bfd68c)
+++ sources/view/hd/alarm/VAlarmStatus.cpp	(.../VAlarmStatus.cpp)	(revision b42479c75add1af6281a6f7d8e6090117eaa55a9)
@@ -104,6 +104,11 @@
 {
     GuiAlarmID alarmID = static_cast<GuiAlarmID>(vData.mTop);
 
+    if (alarmID == GuiAlarmID::ALARM_ID_HD_COMM_TIMEOUT && gDisableTimeout) {
+        LOG_EVENT(tr("Suppressing HD communication timeout."));
+        return;
+    }
+
     // Look for this tag: #First_Time_Message_Sent_With_Silenced
     // this has to be first to make sure in the Notification dialog when we decided to show the dialog,
     // we should also consider checking the alarms Silenced and if it is already silenced,
@@ -132,17 +137,11 @@
     // (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_UNUSED_4           ));
     alarm_Flag_alarmsCondition  (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_TOP_CONDITION      ));
 
-    if (alarmID == GuiAlarmID::ALARM_ID_HD_COMM_TIMEOUT && gDisableTimeout) {
-        LOG_EVENT(tr("Suppressing HD communication timeout."));
-        emit didAlarmRaise();
+    if (vData.mTop == GuiAlarmID::ALARM_ID_NO_ALARM) {
+        emit didAlarmEmpty();
     }
     else {
-        if (vData.mTop == GuiAlarmID::ALARM_ID_NO_ALARM) {
-            emit didAlarmEmpty();
-        }
-        else {
-            emit didAlarmRaise();
-        }
+        emit didAlarmRaise();
     }
 }