diff --git a/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteMotorTestsState.java b/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteMotorTestsState.java
index 9b4d9fe..fea006c 100644
--- a/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteMotorTestsState.java
+++ b/TeamCode/src/main/java/org/timecrafters/diagnostics/rev_hub_test_suite/states/RevHubTestSuiteMotorTestsState.java
@@ -124,10 +124,11 @@ public class RevHubTestSuiteMotorTestsState extends RevTestSuiteTestState {
 
         if (setInitialValue) {
             setInitialValue = false;
+            motor.resetEncoder();
+
             initialValue = motor.getCurrentPosition();
             lastMonitorTime = runTime();
 
-            motor.resetEncoder();
             motor.motorEx.setPower(forward ? 0.5 : -0.5);
         }