Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r29a2c3c7d7618489c0ada9f98e1d30226b455392 -r2a3a47ca90ad19851a30c52f6999a56d5f578783
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 29a2c3c7d7618489c0ada9f98e1d30226b455392)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 2a3a47ca90ad19851a30c52f6999a56d5f578783)
@@ -753,9 +753,12 @@
     {
         if ( TRUE == didTimeout( timeOfLastUICheckIn, UI_COMM_TIMEOUT_IN_MS ) )
         {
-#ifndef DISABLE_UI_COMM_TO_ALARM
-            activateAlarmNoData( ALARM_ID_UI_COMM_TIMEOUT );
-#endif
+#ifndef _RELEASE_
+            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_COMM_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
+#endif
+            {
+                activateAlarmNoData( ALARM_ID_UI_COMM_TIMEOUT );
+            }
         }
 
         if ( TRUE == didTimeout( timeOfLastDGCheckIn, DG_COMM_TIMEOUT_IN_MS ) )