Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r27556b6433949f1d69c0ad954c7019af68bf5b29 -rcd5be724d5a3ba7457e761191d82f278654d7f5c
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 27556b6433949f1d69c0ad954c7019af68bf5b29)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision cd5be724d5a3ba7457e761191d82f278654d7f5c)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2023 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2024 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    ModeStandby.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      14-Jun-2023
+* @date    (last)      10-Nov-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -654,7 +654,7 @@
             else
 #endif
             {
-                if ( ( TRUE == homingInitiated ) && ( TRUE == isSyringePumpHome() ) && ( TRUE == isSyringePumpStopped() ) )
+                if ( ( TRUE == isSyringePumpHome() ) && ( TRUE == isSyringePumpStopped() ) )
                 {
                     syringePumpVerifyForceSensorDACCalibration();
                     homingInitiated = FALSE;                        // reset for next time
@@ -1156,6 +1156,7 @@
         getNVRecord2Driver( GET_USAGE_RECORD, (U08*)&usageRecord, sizeof( HD_USAGE_INFO_RECORD_T ), 0, ALARM_ID_NO_ALARM );
 
         U32 lastChemCompleteDateS      = data.dgUsageInfo.lastChemDisCompleteDateEpoch;
+        U32 lastChemStartDateS         = data.dgUsageInfo.lastChemDisStartDateEpoch;
         U32 lastChemFlushCompleteDateS = data.dgUsageInfo.lastChemDisFlushCompleteDateEpoch;
         U32 lastHeatCompleteDateS      = data.dgUsageInfo.lastHeatDisCompleteDateEpoch;
         U32 lastFlushCompleteDateS     = data.dgUsageInfo.lastBasicFlushCompleteDateEpoch;
@@ -1171,7 +1172,7 @@
         BOOL isHeatDisValid = ( ( currentRTCEpochTimeS - lastHeatCompleteDateS ) < DISINFECTS_TIME_INTERVAL_S ? TRUE : FALSE );
 
         // Last Chem Flush Complete < Last Chem Disinfect Start, so after running a chemical disinfect, a chemical disinfect flush has been done
-        BOOL isChemFlushComplete = ( lastChemFlushCompleteDateS > lastChemCompleteDateS ? TRUE : FALSE );
+        BOOL isChemFlushComplete = ( lastChemFlushCompleteDateS > lastChemStartDateS ? TRUE : FALSE );
 
         // If either of the basic flush, heat disinfect, or chemical disinfect flush have been done within the interval, it means the filters have been flushed
         BOOL isBasicFlushValid       = ( ( currentRTCEpochTimeS - lastFlushCompleteDateS     ) < FLUSH_TIME_INTERVAL_S ? TRUE : FALSE );