diff --git a/src/main/sensors/acceleration.c b/src/main/sensors/acceleration.c
index 6271cdd283..343084d5f6 100644
--- a/src/main/sensors/acceleration.c
+++ b/src/main/sensors/acceleration.c
@@ -207,9 +207,9 @@ void updateAccelerationReadings(void)
         performAcclerationCalibration();
     }
 
-    alignSensors(accADC, accADC, accAlign);
-
     applyAccelerationZero(accZero, accGain);
+
+    alignSensors(accADC, accADC, accAlign);
 }
 
 void setAccelerationZero(flightDynamicsTrims_t * accZeroToUse)
diff --git a/src/main/sensors/gyro.c b/src/main/sensors/gyro.c
index cf003d3be1..4b2514f039 100644
--- a/src/main/sensors/gyro.c
+++ b/src/main/sensors/gyro.c
@@ -154,11 +154,11 @@ void gyroUpdate(void)
         }
     }
 
-    alignSensors(gyroADC, gyroADC, gyroAlign);
-
     if (!isGyroCalibrationComplete()) {
         performAcclerationCalibration(gyroConfig->gyroMovementCalibrationThreshold);
     }
 
     applyGyroZero();
+
+    alignSensors(gyroADC, gyroADC, gyroAlign);
 }