Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -r119a46b83d60901d8134b14d99faddc3e448ac53 -rb7057a961811547a27e355733fca04f5dffb41d4
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 119a46b83d60901d8134b14d99faddc3e448ac53)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision b7057a961811547a27e355733fca04f5dffb41d4)
@@ -270,9 +270,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 );
@@ -318,8 +328,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 );
@@ -333,8 +342,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 );