Index: firmware/App/Modes/ModeTreatmentParams.c
===================================================================
diff -u -rbd0ae373570f7f224bb9a6a4e86f805be77de192 -rdbfeaf78c05fc922eba6ff8c7a31ba8a9392c642
--- firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision bd0ae373570f7f224bb9a6a4e86f805be77de192)
+++ firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision dbfeaf78c05fc922eba6ff8c7a31ba8a9392c642)
@@ -85,7 +85,6 @@
 static BOOL treatParamsConfirmed = FALSE;                               ///< Flag indicates user has confirmed the treatment parameters.
 static BOOL treatParamsRejected = FALSE;                                ///< Flag indicates user has rejected the treatment parameters.
 static BOOL treatmentCancelled = FALSE;                                 ///< Flag indicates user has cancelled the treatment.
-static BOOL validUFVolumeParamReceived = FALSE;                         ///< Flag indicates user has provided UF volume parameter.
 
 // ********** private function prototypes **********
 
@@ -132,8 +131,9 @@
     treatParamsConfirmed = FALSE;
     treatParamsRejected = FALSE;
     treatmentCancelled = FALSE;
-    validUFVolumeParamReceived = FALSE;
 
+    setTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME, 0.0 );
+
     // Set user alarm recovery actions allowed in this mode
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, FALSE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE );
@@ -434,7 +434,6 @@
     }
 
     // Respond to set treatment parameters request message
-    validUFVolumeParamReceived = accepted;
     uFVolumeL = getTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME );
     uFVolumeMl = uFVolumeL * (F32)ML_PER_LITER;
     sendUFVolumeSetResponseMsg( accepted, rejReason, uFVolumeMl );
@@ -444,19 +443,6 @@
 
 /*********************************************************************//**
  * @brief
- * The isUFVolumeParamReceived function determines whether a valid UF volume
- * parameter has been provided by user.
- * @details Inputs: validUFVolumeParamReceived
- * @details Outputs: none
- * @return TRUE if valid UF volume parameter has been received, FALSE if not
- *************************************************************************/
-BOOL isUFVolumeParamReceived( void )
-{
-    return validUFVolumeParamReceived;
-}
-
-/*********************************************************************//**
- * @brief
  * The validateAndSetTreatmentParameters function validates received
  * treatment parameters.
  * @details Inputs: none