Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r94a190522ce398399c7b93c59f788d7666ec0060 -r38974e7129adace42bc44cacbf384a0b1442046c
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 94a190522ce398399c7b93c59f788d7666ec0060)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 38974e7129adace42bc44cacbf384a0b1442046c)
@@ -46,19 +46,20 @@
 
 // ********** private data **********
 
-static DG_STANDBY_MODE_STATE_T standbyState = DG_STANDBY_MODE_STATE_START;  ///< Currently active standby state.
-static BOOL stopSampleWaterRequest = FALSE;                                 ///< Flag indicating HD has requested to stop sample water
-static BOOL startSampleWaterRequest = FALSE;                                ///< Flag indicating HD has requested to start sample water
-static BOOL flushFilterRequest = FALSE;                                     ///< Flag indicating HD has requested to flush filters
-static BOOL endSampleWaterRequest = FALSE;                                  ///< Flag indicating HD has requested to end sample water
+static DG_STANDBY_MODE_STATE_T standbyState = DG_STANDBY_MODE_STATE_START;              ///< Currently active standby state.
+static BOOL stopSampleWaterRequest = FALSE;                                             ///< Flag indicating HD has requested to stop sample water
+static BOOL startSampleWaterRequest = FALSE;                                            ///< Flag indicating HD has requested to start sample water
+static BOOL flushFilterRequest = FALSE;                                                 ///< Flag indicating HD has requested to flush filters
+static BOOL endSampleWaterRequest = FALSE;                                              ///< Flag indicating HD has requested to end sample water
 
-static BOOL pendingStartDGRequest = FALSE;                                  ///< Flag indicating HD has requested DG start (go to generation idle mode).
-static U32 waterSampleStartTime = 0;                                        ///< Time stamp for start of water sample state.
-static U32 filterFlushStartTime = 0;                                        ///< Time stamp for start of filter flush state.
-static U32 filterFlushPublishTimerCounter = 0;                              ///< Filter flush data publish timer counter.
-/// Filter flush time period in ms.
-static OVERRIDE_U32_T filterFlushTimePeriod = { FILTER_FLUSH_TIME_MS, FILTER_FLUSH_TIME_MS, 0, 0 };
+static BOOL pendingStartDGRequest = FALSE;                                              ///< Flag indicating HD has requested DG start (go to generation idle mode).
+static U32  waterSampleStartTime = 0;                                                   ///< Time stamp for start of water sample state.
+static U32  filterFlushStartTime = 0;                                                   ///< Time stamp for start of filter flush state.
+static U32  filterFlushPublishTimerCounter = 0;                                         ///< Filter flush data publish timer counter.
 
+static OVERRIDE_U32_T filterFlushTimePeriod = { FILTER_FLUSH_TIME_MS,
+                                                FILTER_FLUSH_TIME_MS, 0, 0 };           ///< Filter flush time period in ms.
+
 // ********** private function prototypes **********
 
 static DG_STANDBY_MODE_STATE_T handleStandbyIdleState( void );
@@ -89,6 +90,10 @@
 
     // Reset the heaters efficiency for another treatment
     resetHeatersEfficiency();
+
+    // Initialize the reservoirs parameters for another treatment.
+    // This is to make sure the boolean flag for the first fill is set to TRUE.
+    initReservoirs();
 }
 
 /*********************************************************************//**