Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r231665843bcb057cab17d967fa1543d94a66c9df -re408267b7e73d664051a46e65ac248749af8e5be
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 231665843bcb057cab17d967fa1543d94a66c9df)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision e408267b7e73d664051a46e65ac248749af8e5be)
@@ -615,30 +615,32 @@
 
             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
-#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() ) )
-        {
-            syringePumpVerifyForceSensorDACCalibration();
-            homingInitiated = FALSE;                        // reset for next time
-            state = STANDBY_WAIT_FOR_TREATMENT_STATE;       // Go to wait for treatment state after above check
-        }
-    }
-
     return state;
 }