Index: firmware/App/Controllers/Ultrafiltration.c
===================================================================
diff -u -r830213bc6dcc1a684610caf78c79d55f2cb41e93 -r25dfec9cbd60f1fc9f22c00342a1d009c95533ff
--- firmware/App/Controllers/Ultrafiltration.c	(.../Ultrafiltration.c)	(revision 830213bc6dcc1a684610caf78c79d55f2cb41e93)
+++ firmware/App/Controllers/Ultrafiltration.c	(.../Ultrafiltration.c)	(revision 25dfec9cbd60f1fc9f22c00342a1d009c95533ff)
@@ -104,9 +104,22 @@
     // Calculate UF volume and determine UF pause/run
     updateUFRequest();
 
-    // Compensate balancing error at defined interval
-    UpdateUFCompensation();
+    // Trimmer heater enabled, hence UF temp compensation is optional
+    if ( getTestConfigStatus( TEST_CONFIG_ENABLE_UF_TEMP_COMPENSATION ) == TRUE )
+    {
+        // Compensate balancing error at defined interval
+        UpdateUFCompensation();
+    }
+    else if ( TRUE == isUFRateUpdated )
+    {
+        //get updated UF rate
+        compUFrate = getTDUFRate();
 
+        // Update UF rate
+        setConcentratePumpTargetSpeed( D76_PUMP, compUFrate, DOSING_CONT_VOLUME );
+        isUFRateUpdated      = FALSE;
+    }
+
     // execute current ultrafiltration exec state
     switch ( ufExecState )
     {
@@ -181,10 +194,10 @@
 
 /*********************************************************************//**
  * @brief
- * The updateUFRequest function updates the ultrafiltration rate per iteration
- * and of the ultrafiltration.
+ * The updateUFRequest function updates the ultrafiltration requested
+ * flag to true or false based on the conditions.
  * @details \b Inputs: TD Uf rate, TD Dialysate flow rate and bypass flag
- * @details \b Outputs: ufVolumeperIteration , isUltrafiltrationRequested
+ * @details \b Outputs: isUltrafiltrationRequested
  * @return none.
  *************************************************************************/
 static void updateUFRequest( void )