Index: firmware/App/Modes/TreatmentEnd.c
===================================================================
diff -u -r8b73263b38f449dacc0795c67a7cf6240cb79026 -r2b81130d2b0abfa811117ebd2961be6a2fd11737
--- firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision 8b73263b38f449dacc0795c67a7cf6240cb79026)
+++ firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision 2b81130d2b0abfa811117ebd2961be6a2fd11737)
@@ -207,8 +207,9 @@
  * @brief
  * The handleTxEndWait4RinsebackState function handles the treatment end
  * wait for rinseback state operations.
- * @details Inputs: flags
- * @details Outputs: flags handled
+ * @details Inputs: txEndDrainCmdSent, txEndAlarmEndTreatmentRequested,
+ * txEndRinsebackRequested, txEndAlarmRinsebackRequested, txEndTimerCtr
+ * @details Outputs: txEndDrainCmdSent
  * @return next treatment end wait for rinseback state
  *************************************************************************/
 static TREATMENT_END_STATE_T handleTxEndWait4RinsebackState( void )
@@ -220,7 +221,12 @@
     {
         if ( getDGInactiveReservoir() != DG_RESERVOIR_1 )
         {
-            cmdSetDGActiveReservoir( DG_RESERVOIR_2 );
+            DG_SWITCH_RSRVRS_CMD_T rsrvrCmd;
+
+            rsrvrCmd.reservoirID            = (U32)DG_RESERVOIR_2;
+            rsrvrCmd.useLastTrimmerHeaterDC = FALSE;
+
+            cmdSetDGActiveReservoir( &rsrvrCmd );
         }
         else
         {