Index: firmware/App/Modes/SalineBolus.c
===================================================================
diff -u -r31f7f59dc07e9332e9b7f2d1595ecdfa38264a4c -rd8e44751b74daf5ec4723ddbf30614b2e01fcced
--- firmware/App/Modes/SalineBolus.c	(.../SalineBolus.c)	(revision 31f7f59dc07e9332e9b7f2d1595ecdfa38264a4c)
+++ firmware/App/Modes/SalineBolus.c	(.../SalineBolus.c)	(revision d8e44751b74daf5ec4723ddbf30614b2e01fcced)
@@ -294,7 +294,11 @@
     // Handle saline bolus start request from user
     if ( TRUE == salineBolusStartRequested )
     {
-        salineBolusStartRequested = FALSE;
+        if ( getTreatmentState() != TREATMENT_STOP_STATE )
+        {
+            salineBolusStartRequested = FALSE;
+        }
+
         // Cmd all pumps to stop
         setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
         setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
@@ -382,6 +386,11 @@
         result                    = SALINE_BOLUS_STATE_IDLE;
     }
 
+    if ( SALINE_BOLUS_STATE_IDLE == result )
+    {
+        salineBolusStartRequested = FALSE;
+    }
+
     // Are we stopping the bolus?
     if ( result != SALINE_BOLUS_STATE_IN_PROGRESS )
     {