diff --git a/src/main/common/fp_pid.c b/src/main/common/fp_pid.c
index 5edaa193b8c..df8ccaad6b7 100644
--- a/src/main/common/fp_pid.c
+++ b/src/main/common/fp_pid.c
@@ -92,6 +92,11 @@ float navPidApply3(
     /* Pre-calculate output and limit it if actuator is saturating */
     const float outVal = newProportional + (pid->integrator * gainScaler) + newDerivative + newFeedForward;
     const float outValConstrained = constrainf(outVal, outMin, outMax);
+    float backCalc = outValConstrained - outVal;//back-calculation anti-windup
+    if (SIGN(backCalc) == SIGN(pid->integrator)) {
+        //back calculation anti-windup can only shrink integrator, will not push it to the opposite direction
+        backCalc = 0.0f;
+    }
 
     pid->proportional = newProportional;
     pid->integral = pid->integrator;
@@ -104,7 +109,7 @@ float navPidApply3(
         !(pidFlags & PID_ZERO_INTEGRATOR) &&
         !(pidFlags & PID_FREEZE_INTEGRATOR) 
     ) {
-        const float newIntegrator = pid->integrator + (error * pid->param.kI * gainScaler * dt) + ((outValConstrained - outVal) * pid->param.kT * dt);
+        const float newIntegrator = pid->integrator + (error * pid->param.kI * gainScaler * dt) + (backCalc * pid->param.kT * dt);
 
         if (pidFlags & PID_SHRINK_INTEGRATOR) {
             // Only allow integrator to shrink
diff --git a/src/main/common/maths.h b/src/main/common/maths.h
index ff0505fb531..1daed3ef6aa 100644
--- a/src/main/common/maths.h
+++ b/src/main/common/maths.h
@@ -91,6 +91,7 @@
         )
 #define MIN(a, b) _CHOOSE(<, a, b)
 #define MAX(a, b) _CHOOSE(>, a, b)
+#define SIGN(a) ((a >= 0) ? 1 : -1)
 
 #define _ABS_II(x, var)             \
     ( __extension__ ({              \