Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -rb3b6353c4a53798a6cd9dcad5e9dab685bb5d9b0 -r1e78879c57c06487a7eb7858fdb8bb24ff211caf
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision b3b6353c4a53798a6cd9dcad5e9dab685bb5d9b0)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 1e78879c57c06487a7eb7858fdb8bb24ff211caf)
@@ -1430,14 +1430,16 @@
 
         if ( isTreatmentCompleted() != TRUE )
         {
-            data.treatmentTimePrescribedinSec = presTreatmentTimeSecs;
             data.treatmentTimeElapsedinSec = elapsedTreatmentTimeInSecs;
+            // if alarm preventing treatment resumption, treatment is essentially over and we want to indicate that with published treatment time data
             if ( isTreatmentResumeBlocked() != TRUE )
             {
+                data.treatmentTimePrescribedinSec = presTreatmentTimeSecs;
                 data.treatmentTimeRemaininginSec = presTreatmentTimeSecs - elapsedTreatmentTimeInSecs;
             }
             else
             {
+                data.treatmentTimePrescribedinSec = 0;
                 data.treatmentTimeRemaininginSec = 0;
             }
         }