Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -r86c89796fc525ac91dd2e5e999d59a443a3396d2 -rad8064d89dcc995d6c5aa4bfecb502f0ca6e5e2f
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 86c89796fc525ac91dd2e5e999d59a443a3396d2)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision ad8064d89dcc995d6c5aa4bfecb502f0ca6e5e2f)
@@ -270,7 +270,9 @@
     DG_RESERVOIR_ID_T inactiveReservoir = getInactiveReservoir();
     U32 targetVolumeML                  = getTargetDrainVolumeML();
     BOOL drainStatus                    = FALSE;
+    HD_MODE_SUB_MODE_T mode;
 
+    getHDOperationMode(&mode);
     if ( 0 == targetVolumeML )
     {
         drainStatus = hasTargetDrainToZeroBeenReached( inactiveReservoir, DRAIN_WEIGHT_UNCHANGE_TIMEOUT_MS );
@@ -314,15 +316,19 @@
             {
                 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 ( ( mode.hdMode == MODE_PRET ) ||
+                     ( mode.hdMode == MODE_TREA ) )
+                {
+                    activateAlarmNoData( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME );
+                    activateAlarmNoData ( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT );
+                }
             }
 
             if ( ( ( bicarbBottleVolML - getChemicalUsedVolumeML( BICARB ) ) <= CONCENTRATE_BOTTLE_BICARB_LOW_VOLUME_ML ) &&  // SRSDG 837
                  ( getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) != TRUE ) )
             {
-                HD_MODE_SUB_MODE_T mode;
-                getHDOperationMode(&mode);
                 resetChemicalUsedVolumeML( BICARB );
                 setThisFirstFillFlag( TRUE );