Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r46b163d19c65e8c21db7b0247bbb1af0dba1ece5 -r9a96522e0a94724a13c2c9c8f60cf8d18ebde218
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 46b163d19c65e8c21db7b0247bbb1af0dba1ece5)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 9a96522e0a94724a13c2c9c8f60cf8d18ebde218)
@@ -140,14 +140,14 @@
         transitionToNewOperationMode( newMode );
         currentMode = newMode;
 
-        if ( MODE_TREA == lastMode )
+        if ( ( MODE_TREA == lastMode ) && ( currentMode != MODE_TREA ) )
         {
-            // If the current mode is treatment but transitioning to another mode has been requested (including transitioning to fault mode)
+            // If the last mode is treatment but the new mode is not treatment
             // it means the treatment is done. Get the elapsed time since the beginning of the treatment and convert it to hours to be written
             U32 txElapsedTimeMS  = calcTimeSince( getTreatmentStartTimeStamp() );
             F32 txElapsedTimeHrs = (F32)txElapsedTimeMS / ( MIN_PER_HOUR * SEC_PER_MIN * MS_PER_SECOND );
             // Write the treatment hours and set the service to be false so the treatment hours is not reset
-            setTxTimeHours( txElapsedTimeHrs, FALSE );
+            setTxTimeHours( txElapsedTimeHrs );
         }
     }