Index: firmware/App/Modes/TreatmentStop.c
===================================================================
diff -u -r2a9b7df74eaeb013222f5434310da062789fa859 -rc689e58c73eca5cc3a89b493f1e39e934ad112d6
--- firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision 2a9b7df74eaeb013222f5434310da062789fa859)
+++ firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision c689e58c73eca5cc3a89b493f1e39e934ad112d6)
@@ -323,15 +323,15 @@
             result = TREATMENT_STOP_RECOVER_BLOOD_DETECT_STATE;
         }
     }
+    else if ( TRUE == isSalineBolusStartRequested() )
+    {
+        // No need for setup function since the saline bolus exec function starts from Idle and sets the actuators
+        result = TREATMENT_STOP_DELIVER_SALINE_BOLUS_STATE;
+    }
     else
     {
-        if ( ( TREATMENT_STOP_DELIVER_SALINE_BOLUS_STATE != state ) && ( TRUE == isSalineBolusStartRequested() ) )
-        {
-            // No need for setup function since the saline bolus exec function starts from Idle and sets the actuators
-            result = TREATMENT_STOP_DELIVER_SALINE_BOLUS_STATE;
-        }
         // Both unblocked and not in recirculate both state
-        else if ( ( TREATMENT_STOP_RECIRC_STATE != state ) && ( FALSE == dialysateRecircBlocked ) && ( FALSE == bloodRecircBlocked ) )
+        if ( ( TREATMENT_STOP_RECIRC_STATE != state ) && ( FALSE == dialysateRecircBlocked ) && ( FALSE == bloodRecircBlocked ) )
         {
             setupForBloodRecirculationState();
             setupForDialysateRecirculationState();