Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r2c0da4f68ff6d80fd8fd6aacfc445c7b3e3e7555 -r346e74cbf78fdf1ea7cd779103476e49c4ee190e
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 2c0da4f68ff6d80fd8fd6aacfc445c7b3e3e7555)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 346e74cbf78fdf1ea7cd779103476e49c4ee190e)
@@ -926,8 +926,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 )