Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -ra7bc7d6be4a420081936f6659fcb97ea14a7fb91 -r16d911f4c1a722fb179e8b88c784c2c05a073f6d
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision a7bc7d6be4a420081936f6659fcb97ea14a7fb91)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 16d911f4c1a722fb179e8b88c784c2c05a073f6d)
@@ -263,7 +263,19 @@
     DG_RESERVOIR_ID_T inactiveReservoir = getInactiveReservoir();
     U32 targetVolumeML                  = getTargetDrainVolumeML();
     BOOL drainStatus                    = FALSE;
+    BOOL checkLowVolumeAlarms           = TRUE;
+    HD_MODE_SUB_MODE_T mode;
 
+    getHDOperationMode( &mode );
+
+    // Ignore low volume alarms if not in treatment
+    if ( ( ( MODE_TREA == mode.hdMode) && ( TREATMENT_END_STATE == mode.hdSubMode) ) ||
+         ( MODE_POST == mode.hdMode ) )
+    {
+        // do not check low volume alarms
+        checkLowVolumeAlarms = FALSE;
+    }
+
     if ( 0 == targetVolumeML )
     {
         drainStatus = hasTargetDrainToZeroBeenReached( inactiveReservoir, DRAIN_WEIGHT_UNCHANGE_TIMEOUT_MS );
@@ -312,8 +324,13 @@
             {
                 resetChemicalUsedVolumeML( ACID );
                 setThisFirstFillFlag( TRUE );                                 // indicates bottles need prime
-                activateAlarmNoData( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME );
-                activateAlarmNoData ( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT );
+
+                // Alarm only valid in pre-treatment or treatment modes
+                if ( TRUE == checkLowVolumeAlarms )
+                {
+                    activateAlarmNoData( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME );
+                    activateAlarmNoData ( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT );
+                }
             }
 
             if ( ( ( bicarbBottleVolML - getChemicalUsedVolumeML( BICARB ) ) <= MIN_CONCENTRATE_VOLUME_ML ) &&  // SRSDG 837
@@ -322,8 +339,13 @@
             {
                 resetChemicalUsedVolumeML( BICARB );
                 setThisFirstFillFlag( TRUE );
-                activateAlarmNoData( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME );
-                activateAlarmNoData ( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT );
+
+                // Alarm only valid in pre-treatment or treatment modes
+                if ( TRUE == checkLowVolumeAlarms )
+                {
+                    activateAlarmNoData( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME );
+                    activateAlarmNoData ( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT );
+                }
             }
         }