Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -r9353792f6dbd624a1d55cf1e87fa848e8fbaea71 -r59ba490fab6349216bafef4c8438b1b97aaaddcd
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 9353792f6dbd624a1d55cf1e87fa848e8fbaea71)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 59ba490fab6349216bafef4c8438b1b97aaaddcd)
@@ -282,12 +282,6 @@
 
     rinsebackTimerCtr++;
 
-    // Check for user confirmation of end treatment
-    if ( CONFIRMATION_REQUEST_STATUS_ACCEPTED == getConfirmationRequestStatus( GENERIC_CONFIRM_ID_TREATMENT_END ) )
-    {
-        endTreatmentRequested = TRUE;
-    }
-
     switch ( rinsebackState )
     {
         case RINSEBACK_STOP_INIT_STATE:
@@ -484,6 +478,10 @@
         setupForRinsebackDelivery( rinsebackRate_mL_min );
         result = RINSEBACK_RUN_STATE;
     }
+    else if ( TRUE == endTreatmentRequested )
+    {
+        signalEndTreatment();
+    }
     // Has user requested to end rinseback?
     else if ( TRUE == endRinsebackRequested )
     {