Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -re781d3b87509e75ae6a2bde6da3d5819b7b5a2da -r4cc579577062113856fd266cb65b1ccbe33bb596
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision e781d3b87509e75ae6a2bde6da3d5819b7b5a2da)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 4cc579577062113856fd266cb65b1ccbe33bb596)
@@ -7,8 +7,8 @@
 *
 * @file    ModeStandby.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      24-Oct-2022
+* @author  (last)      Sean Nash
+* @date    (last)      01-Dec-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -130,6 +130,8 @@
     initStandbyMode();
     initDGInterface();
     resetAirTrap();
+    resetBloodPumpRotorCount();
+    resetDialInPumpRotorCount();
 
     doorClosedRequired( FALSE, FALSE );
     syringeDetectionRequired( FALSE );
@@ -612,26 +614,35 @@
 
             homingInitiated = TRUE;
         }
+        else
+        {
+            // If homing has been initiated, wait for syringe pump to home and the verify force sensor calibration
+#ifndef _RELEASE_
+            if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP )  )
+            {
+                state = STANDBY_WAIT_FOR_TREATMENT_STATE;       // Go to wait for treatment state after above check
+            }
+            else
+#endif
+            {
+                if ( ( TRUE == homingInitiated ) && ( TRUE == isSyringePumpHome() ) && ( TRUE == isSyringePumpStopped() ) )
+                {
+                    syringePumpVerifyForceSensorDACCalibration();
+                    homingInitiated = FALSE;                        // reset for next time
+                    state = STANDBY_WAIT_FOR_TREATMENT_STATE;       // Go to wait for treatment state after above check
+                }
+            }
+        }
     }
     else
     {
         // Trigger door open alarm to prompt user to close the door
         activateAlarmNoData( ALARM_ID_CARTRIDGE_DOOR_OPENED );
     }
 
-    // If homing has been initiated, wait for syringe pump to home and the verify force sensor calibration
-    if ( ( TRUE == homingInitiated ) && ( TRUE == isSyringePumpHome() ) )
-    {
-        syringePumpVerifyForceSensorDACCalibration();
-        homingInitiated = FALSE;                        // reset for next time
-        state = STANDBY_WAIT_FOR_TREATMENT_STATE;       // Go to wait for treatment state after above check
-    }
-
     return state;
 }
-// Verify calibration
 
-
 /*********************************************************************//**
  * @brief
  * The handleStandbyModeWaitForTreatmentState function handles wait for