Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rc20c77ef196a760a7642d2426e509995e4a98e01 -rfa09ed93f0786712108539a50370aae404335d5e
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision c20c77ef196a760a7642d2426e509995e4a98e01)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision fa09ed93f0786712108539a50370aae404335d5e)
@@ -750,7 +750,9 @@
 static void checkForCommTimeouts( void )
 {
     if ( TRUE == uiDidCommunicate )
-    {
+    {
+        HD_OP_MODE_T opMode = getCurrentOperationMode();
+
         if ( TRUE == didTimeout( timeOfLastUICheckIn, UI_COMM_TIMEOUT_IN_MS ) )
         {
 #ifndef _RELEASE_
@@ -761,13 +763,21 @@
             }
         }
 
-        if ( TRUE == didTimeout( timeOfLastDGCheckIn, DG_COMM_TIMEOUT_IN_MS ) )
+        // Only alarm on DG comm loss while in the treatment workflow
+        if ( MODE_PRET == opMode || MODE_TREA == opMode || MODE_POST == opMode )
         {
+            if ( TRUE == didTimeout( timeOfLastDGCheckIn, DG_COMM_TIMEOUT_IN_MS ) )
+            {
 #ifndef RUN_WITHOUT_DG
-            activateAlarmNoData( ALARM_ID_DG_COMM_TIMEOUT );
-            dgIsCommunicating = FALSE;
+                activateAlarmNoData( ALARM_ID_DG_COMM_TIMEOUT );
+                dgIsCommunicating = FALSE;
 #endif
+            }
         }
+        else // Otherwise clear the alarm
+        {
+            clearAlarm( ALARM_ID_DG_COMM_TIMEOUT );
+        }
     }
 }