Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -r164e1a3ffca18c703676bc7f57f5903c76050600 -r86c89796fc525ac91dd2e5e999d59a443a3396d2
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 164e1a3ffca18c703676bc7f57f5903c76050600)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 86c89796fc525ac91dd2e5e999d59a443a3396d2)
@@ -321,10 +321,18 @@
             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 );
-                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 ( ( mode.hdMode == MODE_PRET ) ||
+                     ( mode.hdMode == MODE_TREA ) )
+                {
+                    activateAlarmNoData( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME );
+                    activateAlarmNoData ( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT );
+                }
             }
         }