Index: sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml
===================================================================
diff -u -r124c2e38e72a1a655d9d479c9c7a1cd8c5d5e6c4 -r38cfd2533651d0db27a2eb07a4491ce0f182e64f
--- sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml	(.../TreatmentSaline.qml)	(revision 124c2e38e72a1a655d9d479c9c7a1cd8c5d5e6c4)
+++ sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml	(.../TreatmentSaline.qml)	(revision 38cfd2533651d0db27a2eb07a4491ce0f182e64f)
@@ -29,9 +29,8 @@
 TreatmentFluid { id: _root
     readonly property bool isStarted            : vHDTreatmentStates.sbRunning
     readonly property bool isIdle               : vHDTreatmentStates.sbIdle
-    // other that max saline bolus delivered,
-    // if saline started but still is waiting for pump the button is disabled so user won't tap multiple times.
-    readonly property bool isDisabled           : vHDTreatmentStates.sbMaxReached
+    // Saline bolus is enabled in treatment
+    readonly property bool isDisabled           : false
     readonly property bool isWaitPump           : vHDTreatmentStates.sbWaitPump
 
     QtObject { id: _private
Index: sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp
===================================================================
diff -u -r124c2e38e72a1a655d9d479c9c7a1cd8c5d5e6c4 -r38cfd2533651d0db27a2eb07a4491ce0f182e64f
--- sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp	(.../VHDTreatmentStatesData.cpp)	(revision 124c2e38e72a1a655d9d479c9c7a1cd8c5d5e6c4)
+++ sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp	(.../VHDTreatmentStatesData.cpp)	(revision 38cfd2533651d0db27a2eb07a4491ce0f182e64f)
@@ -73,12 +73,10 @@
     ENUM_CHECK  ( GuiSalineStates, SALINE_BOLUS_STATE_IDLE                                  )
     ENUM_CHECK  ( GuiSalineStates, SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP                   )
     ENUM_CHECK  ( GuiSalineStates, SALINE_BOLUS_STATE_IN_PROGRESS                           )
-    ENUM_CHECK  ( GuiSalineStates, SALINE_BOLUS_STATE_MAX_DELIVERED                         )
     ENUM_CHECK_C( GuiSalineStates, NUM_OF_SALINE_BOLUS_STATES                               ) }
     ENUM_READ   ( GuiSalineStates, SALINE_BOLUS_STATE_IDLE                  , sbIdle        );
     ENUM_READ   ( GuiSalineStates, SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP   , sbWaitPump    );
     ENUM_READ   ( GuiSalineStates, SALINE_BOLUS_STATE_IN_PROGRESS           , sbRunning     );
-    ENUM_READ   ( GuiSalineStates, SALINE_BOLUS_STATE_MAX_DELIVERED         , sbMaxReached  );
 
     // Heparin States
     _heparin                = false;
@@ -209,12 +207,14 @@
         ENUM_CHECK  ( GuiTreatmentStopStates  , TREATMENT_STOP_RECIRC_BLOOD_ONLY_STATE                              )
         ENUM_CHECK  ( GuiTreatmentStopStates  , TREATMENT_STOP_NO_RECIRC_STATE                                      )
         ENUM_CHECK  ( GuiTreatmentStopStates  , TREATMENT_STOP_RECOVER_BLOOD_DETECT_STATE                           )
+        ENUM_CHECK  ( GuiTreatmentStopStates  , TREATMENT_STOP_DELIVER_SALINE_BOLUS_STATE                           )
         ENUM_CHECK_C( GuiTreatmentStopStates  , NUM_OF_TREATMENT_STOP_STATES                                        ) }
         ENUM_READ   ( GuiTreatmentStopStates  , TREATMENT_STOP_RECIRC_STATE               , tsRecirculate           )
         ENUM_READ   ( GuiTreatmentStopStates  , TREATMENT_STOP_RECIRC_DIALYSATE_ONLY_STATE, tsRecirculateDialysate  )
         ENUM_READ   ( GuiTreatmentStopStates  , TREATMENT_STOP_RECIRC_BLOOD_ONLY_STATE    , tsRecirculateBlood      )
         ENUM_READ   ( GuiTreatmentStopStates  , TREATMENT_STOP_NO_RECIRC_STATE            , tsRecirculateNo         )
         ENUM_READ   ( GuiTreatmentStopStates  , TREATMENT_STOP_RECOVER_BLOOD_DETECT_STATE , tsRecoverBloodDetect    )
+        ENUM_READ   ( GuiTreatmentStopStates  , TREATMENT_STOP_DELIVER_SALINE_BOLUS_STATE , tsDeliverSalineBolus    )
     }
     txStop ( mTreatmentStop );
 
Index: sources/view/hd/data/treatment/VHDTreatmentStatesData.h
===================================================================
diff -u -r124c2e38e72a1a655d9d479c9c7a1cd8c5d5e6c4 -r38cfd2533651d0db27a2eb07a4491ce0f182e64f
--- sources/view/hd/data/treatment/VHDTreatmentStatesData.h	(.../VHDTreatmentStatesData.h)	(revision 124c2e38e72a1a655d9d479c9c7a1cd8c5d5e6c4)
+++ sources/view/hd/data/treatment/VHDTreatmentStatesData.h	(.../VHDTreatmentStatesData.h)	(revision 38cfd2533651d0db27a2eb07a4491ce0f182e64f)
@@ -79,7 +79,6 @@
     PROPERTY( bool   , sbIdle                   , true ) ///< SALINE_BOLUS_STATE_IDLE                   = 0  # No saline bolus delivery is in progress
     PROPERTY( bool   , sbWaitPump               , false) ///< SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP    = 1  # Wait for pumps to stop before starting bolus
     PROPERTY( bool   , sbRunning                , false) ///< SALINE_BOLUS_STATE_IN_PROGRESS            = 2  # A saline bolus delivery is in progress
-    PROPERTY( bool   , sbMaxReached             , false) ///< SALINE_BOLUS_STATE_MAX_DELIVERED          = 3  # Maximum saline bolus volume reached - no more saline bolus deliveries allowed
 
     // ---- Heparin states
     PROPERTY( bool   , hpOff                    , true ) ///< HEPARIN_STATE_OFF                         = 0  # No heparin delivery is in progress
@@ -123,6 +122,7 @@
     PROPERTY( bool   , tsRecirculateBlood       , false) ///< TREATMENT_STOP_RECIRC_BLOOD_ONLY_STATE    = 2, Re-circulate Blood only state of the treatment re-circulate sub-mode state machine
     PROPERTY( bool   , tsRecirculateNo          , false) ///< TREATMENT_STOP_NO_RECIRC_STATE            = 3, No re-circulation state of the treatment stop sub-mode state machine
     PROPERTY( bool   , tsRecoverBloodDetect     , false) ///< TREATMENT_STOP_RECOVER_BLOOD_DETECT_STATE = 4, Treatment stop recover blood detect state
+    PROPERTY( bool   , tsDeliverSalineBolus     , false) ///< TREATMENT_STOP_DELIVER_SALINE_BOLUS_STATE = 5, Treatment stop deliver saline bolus state
 
     // class definition
     VIEW_DEC_CLASS(VHDTreatmentStates)