Index: sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml
===================================================================
diff -u -r4035d2b14054e7d12a2f51e2763d84620b1a19a1 -re224214d2346bf98de254d6ab3793e7ec0f5f07c
--- sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml	(.../TreatmentSaline.qml)	(revision 4035d2b14054e7d12a2f51e2763d84620b1a19a1)
+++ sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml	(.../TreatmentSaline.qml)	(revision e224214d2346bf98de254d6ab3793e7ec0f5f07c)
@@ -39,6 +39,8 @@
     property int valueTarget    : vTreatmentSaline.target || vTreatmentAdjustmentSaline.target
     property int valueCumulative: vTreatmentSaline.cumulative
     property int valueDelivered : vTreatmentSaline.delivered
+    property bool bolusPermitted: vTreatmentSaline.bolusPermitted
+
     property string buttonText  :   isIdle      ?   _private.textStart :
                                     isStarted   ?   _private.textStop  :
                                                     _root.buttonText
@@ -117,7 +119,7 @@
             text.textFormat : Text.RichText
             text.text       : buttonText
             isDefault       : true
-            enabled         : isStarted || isIdle
+            enabled         : (isStarted || isIdle) & _root.bolusPermitted
 
             text.font {
                 weight      : Font.DemiBold
Index: sources/model/td/data/treatment/MTreatmentSalineData.cpp
===================================================================
diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -re224214d2346bf98de254d6ab3793e7ec0f5f07c
--- sources/model/td/data/treatment/MTreatmentSalineData.cpp	(.../MTreatmentSalineData.cpp)	(revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8)
+++ sources/model/td/data/treatment/MTreatmentSalineData.cpp	(.../MTreatmentSalineData.cpp)	(revision e224214d2346bf98de254d6ab3793e7ec0f5f07c)
@@ -18,19 +18,19 @@
 
 QVariantList MTreatmentSaline::parameters() const {
     return {
-        _data.mTarget     .value,
-        _data.mCumulative .value,
-        _data.mDelivered  .value,
-        _data.mState      .value,
+        _data.mTarget           .value,
+        _data.mDelivered        .value,
+        _data.mCumulative       .value,
+        _data.mBolusPermitted   .value,
     };
 }
 
 bool MTreatmentSaline::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if ( ! GetValue(vByteArray, index, _data.mTarget     )) goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mCumulative )) goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mDelivered  )) goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mState      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTarget            )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDelivered         )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCumulative        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mBolusPermitted    )) goto lError;
 
     return true ;
     
@@ -47,9 +47,9 @@
  */
 MTreatmentSaline::Data MTreatmentSaline::data() const {
     Data data;
-    data.mTarget     = _data.mTarget     .value;
-    data.mCumulative = _data.mCumulative .value;
-    data.mDelivered  = _data.mDelivered  .value;
-    data.mState      = _data.mState      .value;
+    data.mTarget            = _data.mTarget         .value;
+    data.mDelivered         = _data.mDelivered      .value;
+    data.mCumulative        = _data.mCumulative     .value;
+    data.mBolusPermitted    = _data.mBolusPermitted .value;
     return data;
 }
Index: sources/model/td/data/treatment/MTreatmentSalineData.h
===================================================================
diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -re224214d2346bf98de254d6ab3793e7ec0f5f07c
--- sources/model/td/data/treatment/MTreatmentSalineData.h	(.../MTreatmentSalineData.h)	(revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8)
+++ sources/model/td/data/treatment/MTreatmentSalineData.h	(.../MTreatmentSalineData.h)	(revision e224214d2346bf98de254d6ab3793e7ec0f5f07c)
@@ -36,10 +36,11 @@
  *
  * | Payload  ||
  * |          ||
- * | #1:(U32) | \ref Data::mTarget     |
- * | #2:(F32) | \ref Data::mCumulative |
- * | #3:(F32) | \ref Data::mDelivered  |
- * | #4:(U32) | \ref Data::mState      |
+ * | #1:(U32) | \ref Data::mTarget          |
+ * | #2:(F32) | \ref Data::mDelivered       |
+ * | #3:(F32) | \ref Data::mCumulative      |
+ * | #4:(U32) | \ref Data::mBolusPermitted  |
+
  *
  * \sa Data
  * \sa MAdjustSalineReq : Saline Bolus Request
@@ -61,10 +62,10 @@
     QVariantList parameters() const override;
 
     struct {
-        Types::U32  mTarget     ;
-        Types::F32  mCumulative ;
-        Types::F32  mDelivered  ;
-        Types::U32  mState      ;
+        Types::U32  mTarget         ;
+        Types::F32  mDelivered      ;
+        Types::F32  mCumulative     ;
+        Types::U32  mBolusPermitted ;
     } _data;
 
 public:
@@ -74,10 +75,10 @@
     QString      infoText() const override { return QString("Saline") ; }
 
     struct Data {
-        quint32     mTarget      = 0; ///< Target volume for the current started saline bolus
-        float       mCumulative  = 0; ///< Cumulative volume of all saline deliveries during current treatment
-        float       mDelivered   = 0; ///< Current delivered saline volume
-        quint32     mState       = 0; ///< Saline Bolus state
+        quint32     mTarget         = 0; ///< Target volume for the current started saline bolus
+        float       mDelivered      = 0; ///< Current delivered saline volume
+        float       mCumulative     = 0; ///< Cumulative volume of all saline deliveries during current treatment
+        quint32     mBolusPermitted = 0; ///< True if Bolus is permitted currently
     };
 
 public:
Index: sources/view/td/data/treatment/VTreatmentSalineData.cpp
===================================================================
diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -re224214d2346bf98de254d6ab3793e7ec0f5f07c
--- sources/view/td/data/treatment/VTreatmentSalineData.cpp	(.../VTreatmentSalineData.cpp)	(revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8)
+++ sources/view/td/data/treatment/VTreatmentSalineData.cpp	(.../VTreatmentSalineData.cpp)	(revision e224214d2346bf98de254d6ab3793e7ec0f5f07c)
@@ -21,8 +21,8 @@
 
 void VTreatmentSaline::onActionReceive(const TreatmentSalineData &vData)
 {
-    target     (vData.mTarget    );
-    cumulative (vData.mCumulative);
-    delivered  (vData.mDelivered );
-    state      (vData.mState     );
+    target          (vData.mTarget          );
+    delivered       (vData.mDelivered       );
+    cumulative      (vData.mCumulative      );
+    bolusPermitted  (vData.mBolusPermitted  );
 }
Index: sources/view/td/data/treatment/VTreatmentSalineData.h
===================================================================
diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -re224214d2346bf98de254d6ab3793e7ec0f5f07c
--- sources/view/td/data/treatment/VTreatmentSalineData.h	(.../VTreatmentSalineData.h)	(revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8)
+++ sources/view/td/data/treatment/VTreatmentSalineData.h	(.../VTreatmentSalineData.h)	(revision e224214d2346bf98de254d6ab3793e7ec0f5f07c)
@@ -36,10 +36,10 @@
 {
     Q_OBJECT
 
-    PROPERTY( quint32 , target     , 0)
-    PROPERTY( float   , cumulative , 0)
-    PROPERTY( float   , delivered  , 0)
-    PROPERTY( quint32 , state      , 0)
+    PROPERTY( quint32 , target          , 0)
+    PROPERTY( float   , delivered       , 0)
+    PROPERTY( float   , cumulative      , 0)
+    PROPERTY( quint32 , bolusPermitted  , 0)
 
     VIEW_DEC(VTreatmentSaline, TreatmentSalineData)
 };