Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r741de51a7150d167e3bb60ca4b40bac4ec5b8e51 -r05c60dd887a705b7044d4e0545776b99583cfa3d
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 741de51a7150d167e3bb60ca4b40bac4ec5b8e51)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 05c60dd887a705b7044d4e0545776b99583cfa3d)
@@ -625,8 +625,6 @@
         // to dialysate production directly
         if ( TRUE == isThisTheFirstFill() )
         {
-            resetChemicalUsedVolumeML( BICARB );
-            resetChemicalUsedVolumeML( ACID );
             result = DG_FILL_MODE_STATE_PRIME_CONCENTRATE_LINES;
         }
         else
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -re6c60e07b450ec8d58e87bf13d45f96efab54d8b -r05c60dd887a705b7044d4e0545776b99583cfa3d
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision e6c60e07b450ec8d58e87bf13d45f96efab54d8b)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 05c60dd887a705b7044d4e0545776b99583cfa3d)
@@ -23,6 +23,7 @@
 #include "MessageSupport.h"
 #include "ModeChemicalDisinfect.h"
 #include "ModeFault.h"
+#include "ModeFill.h"
 #include "ModeHeatDisinfect.h"
 #include "ModeStandby.h"
 #include "NVDataMgmt.h"
@@ -263,6 +264,9 @@
     {
         pendingStartDGRequest = FALSE;
         signalSyncToHD();
+        // About to start a treatment reset the chemical bottles volumes (regardless whether the user has inserted new bottles)
+        resetChemicalUsedVolumeML( BICARB );
+        resetChemicalUsedVolumeML( ACID );
         requestNewOperationMode( DG_MODE_GENE );
     }
     else if ( TRUE == pendingStartDGFlushRequest )