diff --git a/ArduPlane/Attitude.cpp b/ArduPlane/Attitude.cpp
index c2f6961c91..f94b48d37c 100644
--- a/ArduPlane/Attitude.cpp
+++ b/ArduPlane/Attitude.cpp
@@ -1078,6 +1078,9 @@ void Plane::set_servos(void)
                 }
                 break;
             default:
+                if (in_preLaunch_flight_stage()) {
+                    auto_flap_percent = g.takeoff_flap_percent;
+                }
                 break;
             }
         }