Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -rce8cdf93f8b3fe230bdc16e4e112d4af01024bab -rf18ceef65c96d9f1cd5464cf63e91c4d5a391ede
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision ce8cdf93f8b3fe230bdc16e4e112d4af01024bab)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision f18ceef65c96d9f1cd5464cf63e91c4d5a391ede)
@@ -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 )
     {