Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r51e60f3e3a7c95c910c24dd5f3b58e0c6b2691b8 -r587d23c7ba96d1938658908ceb67850e4e4e08c8
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 51e60f3e3a7c95c910c24dd5f3b58e0c6b2691b8)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 587d23c7ba96d1938658908ceb67850e4e4e08c8)
@@ -29,7 +29,9 @@
 #include "ModeService.h"
 #include "ModeSolo.h"
 #include "ModeStandby.h"
+#include "NVDataMgmt.h"
 #include "OperationModes.h"
+#include "ROPump.h"
 #include "SystemCommMessages.h"
 #include "TaskGeneral.h"
 
@@ -150,6 +152,10 @@
         lastMode = currentMode;
         transitionToNewOperationMode( newMode );
         currentMode = newMode;
+
+        // Mode is changing, write the RO generated volume to the RTC RAM and set the service flag to FALSE
+        // since this is not a from a service change
+        setROWaterGeneratedL( getROGeneratedVolumeL(), FALSE );
     }
 
     // mode specific processing to be done continuously