diff --git a/src/FirmwarePlugin/APM/APMRallyPointManager.cc b/src/FirmwarePlugin/APM/APMRallyPointManager.cc
index 8061f8e57433ae94f08aa7beb136568537934217..76eb2a8769b108b62e81ac36b5b4c40a4fec3205 100644
--- a/src/FirmwarePlugin/APM/APMRallyPointManager.cc
+++ b/src/FirmwarePlugin/APM/APMRallyPointManager.cc
@@ -90,7 +90,7 @@ void APMRallyPointManager::_mavlinkMessageReceived(const mavlink_message_t& mess
 
         QGeoCoordinate point((float)rallyPoint.lat / 1e7, (float)rallyPoint.lng / 1e7, rallyPoint.alt);
         _rgPoints.append(point);
-        if (rallyPoint.idx < _cReadRallyPoints - 2) {
+        if (rallyPoint.idx < _cReadRallyPoints - 1) {
             // Still more points to request
             _requestRallyPoint(++_currentRallyPoint);
         } else {