diff --git a/.DS_Store b/.DS_Store
index d7dc2c79..1a598769 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/.gitignore b/.gitignore
index 10d6a56b..c4b10095 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ SmartSpin_logfile.txt
 .DS_Store
 build/CMakeCache.txt
 *.log
+.DS_Store
diff --git a/src/Main.cpp b/src/Main.cpp
index 06c01433..4d0920bf 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -199,7 +199,8 @@ void SS2K::maintenanceLoop(void *pvParameters) {
 
     // send BLE notification for any userConfig values that changed.
     BLE_ss2kCustomCharacteristic::parseNemit();
-
+      // If we're in ERG mode, modify shift commands to inc/dec the target watts instead.
+      ss2k->FTMSModeShiftModifier();
     // If we have a resistance bike attached, slow down when we're close to the limits.
     if (ss2k->pelotonIsConnected) {
       int speed           = userConfig->getStepperSpeed();
@@ -410,8 +411,6 @@ void SS2K::moveStepper(void *pvParameters) {
     if (stepper) {
       ss2k->stepperIsRunning = stepper->isRunning();
       ss2k->currentPosition  = stepper->getCurrentPosition();
-      // If we're in ERG mode, modify shift commands to inc/dec the target watts instead.
-      ss2k->FTMSModeShiftModifier();
       if (!ss2k->externalControl) {
         if ((rtConfig->getFTMSMode() == FitnessMachineControlPointProcedure::SetTargetPower) ||
             (rtConfig->getFTMSMode() == FitnessMachineControlPointProcedure::SetTargetResistanceLevel)) {