Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -raa7b1f5f68aae23c1c52b32658fcb625c29accfb -r8abde9a00d09d1e687be6fe88592e66706c1a81d
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision aa7b1f5f68aae23c1c52b32658fcb625c29accfb)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 8abde9a00d09d1e687be6fe88592e66706c1a81d)
@@ -687,7 +687,7 @@
 {
     F32 vRef = forceSensorCalRecord.hdHeparinForceSensorDACVoltage;
 
-    if ( ( vRef >= 0.0 ) && ( vRef <= SYRINGE_PUMP_ADC_REF_V ) )
+    if ( ( vRef >= 0.0F ) && ( vRef <= SYRINGE_PUMP_ADC_REF_V ) )
     {   // Cannot set DAC value if pump is busy or calibration values have not been provided yet
         if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) && ( forceSensorCalRecord.calibrationTime != 0 ) )
         {
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r044d8892373acc5545020aab894cd1943c4d7449 -r8abde9a00d09d1e687be6fe88592e66706c1a81d
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 044d8892373acc5545020aab894cd1943c4d7449)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 8abde9a00d09d1e687be6fe88592e66706c1a81d)
@@ -613,30 +613,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;
 }