Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r6d750c93f17571bbeba89404b63d87f37a9243af -raf0702a1166af3dcae57506d922f81038d65e0af
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 6d750c93f17571bbeba89404b63d87f37a9243af)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision af0702a1166af3dcae57506d922f81038d65e0af)
@@ -128,7 +128,6 @@
 
 static U32 treatmentStartTimeStamp;                             ///< Treatment start timestampt for logging purpose.
 static U32 treatmentEndTimeStamp;                               ///< Treatment end timestampt for logging purpose.
-static BOOL hasTreatmentStartTimeBeenWrittenToNV;               ///< Boolean flag to indicate whether treatment start time has been started or not.
 
 // ********** private function prototypes **********
 
@@ -195,7 +194,6 @@
 
     treatmentStartTimeStamp = getRTCTimestamp();
     treatmentEndTimeStamp = 0;
-    hasTreatmentStartTimeBeenWrittenToNV = FALSE;
 }
 
 /*********************************************************************//**
@@ -221,6 +219,9 @@
         initTreatmentEnd();
     }
 
+    // Started the treatment set the start time in epoch
+    setTxLastStartTimeEpoch( getRTCTimestamp() );
+
     setCurrentSubState( NO_SUB_STATE );
     // Enable venous bubble detection in treatment mode
     setVenousBubbleDetectionEnabled( TRUE );
@@ -629,13 +630,6 @@
         checkDialysateTemperature();
     }
 
-    // Record treatment start time if not done yet
-    if ( FALSE == hasTreatmentStartTimeBeenWrittenToNV )
-    {
-        // Started the treatment set the start time in epoch
-        hasTreatmentStartTimeBeenWrittenToNV = setTxLastStartTimeEpoch( getRTCTimestamp() );
-    }
-
     // Treatment mode state machine
     switch ( currentTreatmentState )
     {
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r791b25bd20e80fce8c5d7e8a3ac37d8395f2315c -raf0702a1166af3dcae57506d922f81038d65e0af
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 791b25bd20e80fce8c5d7e8a3ac37d8395f2315c)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision af0702a1166af3dcae57506d922f81038d65e0af)
@@ -5451,6 +5451,7 @@
     if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+
         if ( FALSE == payload.reset )
         {
             result = testSetBatteryRemainingCapacityOverride( payload.state.f32 );