Index: firmware/App/Modes/TreatmentStop.c
===================================================================
diff -u -rc689e58c73eca5cc3a89b493f1e39e934ad112d6 -r43648984725f44d6f73e20e1bf2e7ea44bc6e86b
--- firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision c689e58c73eca5cc3a89b493f1e39e934ad112d6)
+++ firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision 43648984725f44d6f73e20e1bf2e7ea44bc6e86b)
@@ -297,6 +297,8 @@
     }
     // Broadcast treatment stop status
     publishTreatmentStopData();
+    // Just pass the blood leak related as 0 since only saline bolus data needs to be published
+    publishSalineBolusData( 0.0, 0.0, 0 );
 }
 
 /*********************************************************************//**
@@ -323,7 +325,7 @@
             result = TREATMENT_STOP_RECOVER_BLOOD_DETECT_STATE;
         }
     }
-    else if ( TRUE == isSalineBolusStartRequested() )
+    else if ( ( TRUE == isSalineBolusStartRequested() ) || ( getSalineBolusState() != SALINE_BOLUS_STATE_IDLE ) )
     {
         // 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;