Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r4179eaf9c16e3607ce8abd961f154c2aaab2dffd -rc41e74ff80145e90c7066a5970c149c2ed4d59dd
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 4179eaf9c16e3607ce8abd961f154c2aaab2dffd)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision c41e74ff80145e90c7066a5970c149c2ed4d59dd)
@@ -209,6 +209,10 @@
  *************************************************************************/
 void checkInFromUI( void )
 {
+    if ( FALSE == uiDidCommunicate )
+    {   // Start DG check-in timer when UI first communicates
+        timeOfLastDGCheckIn = getMSTimerCount();
+    }
     uiIsCommunicating = TRUE;
     timeOfLastUICheckIn = getMSTimerCount();
     uiDidCommunicate = TRUE;
@@ -935,12 +939,12 @@
         {
             activateAlarmNoData( ALARM_ID_UI_COMM_TIMEOUT );
         }
+        if ( TRUE == didTimeout( timeOfLastDGCheckIn, DG_COMM_TIMEOUT_IN_MS ) )
+        {
+            activateAlarmNoData( ALARM_ID_DG_COMM_TIMEOUT );
+            dgIsCommunicating = FALSE;
+        }
     }
-    if ( TRUE == didTimeout( timeOfLastDGCheckIn, DG_COMM_TIMEOUT_IN_MS ) )
-    {
-        activateAlarmNoData( ALARM_ID_DG_COMM_TIMEOUT );
-        dgIsCommunicating = FALSE;
-    }
 }
 
 /*********************************************************************//**