Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -rcc10d34b632240d97424531ac43dcf09c7ae94ed -r978355c6e24dcf66eb7cf87706ede4c97298b535
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision cc10d34b632240d97424531ac43dcf09c7ae94ed)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 978355c6e24dcf66eb7cf87706ede4c97298b535)
@@ -272,9 +272,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 );
@@ -322,8 +332,7 @@
                 setThisFirstFillFlag( TRUE );                                 // indicates bottles need prime
 
                 // Alarm only valid in pre-treatment or treatment modes
-                if ( ( mode.hdMode == MODE_PRET ) ||
-                     ( mode.hdMode == MODE_TREA ) )
+                if ( TRUE == checkLowVolumeAlarms )
                 {
                     activateAlarmNoData( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME );
                     activateAlarmNoData ( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT );
@@ -337,8 +346,7 @@
                 setThisFirstFillFlag( TRUE );
 
                 // Alarm only valid in pre-treatment or treatment modes
-                if ( ( mode.hdMode == MODE_PRET ) ||
-                     ( mode.hdMode == MODE_TREA ) )
+                if ( TRUE == checkLowVolumeAlarms )
                 {
                     activateAlarmNoData( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME );
                     activateAlarmNoData ( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT );