Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml
===================================================================
diff -u -r13d04e674e9d22091bcc72b97574bbba21fdc9c9 -r10011ab15490b74e2c50d224b2fd1ceeeea75444
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision 13d04e674e9d22091bcc72b97574bbba21fdc9c9)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision 10011ab15490b74e2c50d224b2fd1ceeeea75444)
@@ -289,16 +289,16 @@
                     allowOff        : true
                     onValueChanged  : {
                         if ( ! _heparinDispensingRate.valid ) { vTreatmentCreate.heparinDispensingRateRejectReason = Variables.noRejectReason }
+                        // set heparin time to clear when set OFF to value
+                        if ( ! vTreatmentCreate.heparinDispensingRate && value ) { _heparinStopTimeControl.clear() }
+
                         vTreatmentCreate.heparinDispensingRate = value
 
                         // if set to OFF set heparin stop time 0
                         if ( ! vTreatmentCreate.heparinDispensingRate ) {
                             _heparinStopTimeControl.active = true
                             _heparinStopTimeControl.value = 0
                         }
-
-                        // set heparin time to clear when set
-                        if ( _heparinStopTimeControl.enabled ) { _heparinStopTimeControl.clear() }
                     }
 
                     onActiveChanged: {