diff --git a/src/uas/UASWaypointManager.cc b/src/uas/UASWaypointManager.cc
index b886f7398fe0769130679bbd221a7f9791bae57b..17680bde41269c2c914b790e4811e0c88a01577d 100644
--- a/src/uas/UASWaypointManager.cc
+++ b/src/uas/UASWaypointManager.cc
@@ -400,6 +400,7 @@ void UASWaypointManager::saveWaypoints(const QString &saveFile)
 
     for (int i = 0; i < waypoints.size(); i++)
     {
+        waypoints[i]->setId(i);
         waypoints[i]->save(out);
     }
     file.close();