Index: firmware/App/Modes/TreatmentStop.c
===================================================================
diff -u -rc9890bc0bc9a1d779be9fec7e0478cfc6fba1cfb -rb38d8ceb35a5a4a41b4fa64a44a7db9cebbd6c2f
--- firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision c9890bc0bc9a1d779be9fec7e0478cfc6fba1cfb)
+++ firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision b38d8ceb35a5a4a41b4fa64a44a7db9cebbd6c2f)
@@ -353,8 +353,9 @@
             setupForBloodRecirculationStopState();
             result = TREATMENT_STOP_RECIRC_DIALYSATE_ONLY_STATE;
         }
-        else if ( ( TREATMENT_STOP_DELIVER_SALINE_BOLUS_STATE != 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;
         }
     }