diff --git a/src/FirmwarePlugin/FirmwarePlugin.cc b/src/FirmwarePlugin/FirmwarePlugin.cc
index 57debcebf2c0a2ad322efe95c86357aaf2f5e8c9..489274ba78192ebbf598a1b5a491ba9696a225b0 100644
--- a/src/FirmwarePlugin/FirmwarePlugin.cc
+++ b/src/FirmwarePlugin/FirmwarePlugin.cc
@@ -485,7 +485,7 @@ bool FirmwarePlugin::_setFlightModeAndValidate(Vehicle* vehicle, const QString&
         vehicle->setFlightMode(flightMode);
 
         // Wait for vehicle to return flight mode
-        for (int i=0; i<22; i++) {
+        for (int i=0; i<13; i++) {
             if (vehicle->flightMode() == flightMode) {
                 flightModeChanged = true;
                 break;