Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r8c195e4b22d63a6b8de9089ff6bf704282f54885 -r936af6ef50b7f16aedb18bafeef1273767740f92
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 8c195e4b22d63a6b8de9089ff6bf704282f54885)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 936af6ef50b7f16aedb18bafeef1273767740f92)
@@ -761,21 +761,21 @@
             }
         }
 
-        // 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 ) )
         {
-            if ( TRUE == didTimeout( timeOfLastDGCheckIn, DG_COMM_TIMEOUT_IN_MS ) )
-            {
 #ifndef RUN_WITHOUT_DG
+            // Only alarm on DG comm loss while in the treatment workflow
+            if ( MODE_PRET == opMode || MODE_TREA == opMode || MODE_POST == opMode )
+            {
                 activateAlarmNoData( ALARM_ID_DG_COMM_TIMEOUT );
-                dgIsCommunicating = FALSE;
-#endif
             }
+            else // Otherwise clear the alarm
+            {
+                clearAlarmCondition( ALARM_ID_DG_COMM_TIMEOUT );
+            }
+            dgIsCommunicating = FALSE;
+#endif
         }
-        else // Otherwise clear the alarm
-        {
-            clearAlarmCondition( ALARM_ID_DG_COMM_TIMEOUT );
-        }
     }
 }