Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r9353792f6dbd624a1d55cf1e87fa848e8fbaea71 -r59ba490fab6349216bafef4c8438b1b97aaaddcd
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 9353792f6dbd624a1d55cf1e87fa848e8fbaea71)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 59ba490fab6349216bafef4c8438b1b97aaaddcd)
@@ -933,8 +933,17 @@
 {
     TREATMENT_STATE_T result = TREATMENT_RECIRC_STATE;
 
-    // Execute treatment re-circ sub-mode
-    execTreatmentRecirc();
+    // If user requests treatment end, end treatment
+    if ( TRUE == endTreatmentAlarmResponseRequest )
+    {
+        sendLastTreatmentPeriodicData = TRUE;
+        requestNewOperationMode( MODE_POST );
+    }
+    else
+    {
+        // Execute treatment re-circ sub-mode
+        execTreatmentRecirc();
+    }
 
     // Handle signals from treatment re-circ sub-mode
     if ( TRUE == rinsebackToStoppedRequest )