Index: firmware/App/Modes/TreatmentStop.c
===================================================================
diff -u -rb38d8ceb35a5a4a41b4fa64a44a7db9cebbd6c2f -r2a9b7df74eaeb013222f5434310da062789fa859
--- firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision b38d8ceb35a5a4a41b4fa64a44a7db9cebbd6c2f)
+++ firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision 2a9b7df74eaeb013222f5434310da062789fa859)
@@ -325,8 +325,13 @@
     }
     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
-        if ( ( TREATMENT_STOP_RECIRC_STATE != state ) && ( FALSE == dialysateRecircBlocked ) && ( FALSE == bloodRecircBlocked ) )
+        else if ( ( TREATMENT_STOP_RECIRC_STATE != state ) && ( FALSE == dialysateRecircBlocked ) && ( FALSE == bloodRecircBlocked ) )
         {
             setupForBloodRecirculationState();
             setupForDialysateRecirculationState();
@@ -353,11 +358,6 @@
             setupForBloodRecirculationStopState();
             result = TREATMENT_STOP_RECIRC_DIALYSATE_ONLY_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;
-        }
     }
 
     return result;