diff --git a/src/uas/UASWaypointManager.cc b/src/uas/UASWaypointManager.cc
index f399286e7632d972233816783f4eea09be3493aa..f1765e9e1793e5958e33e679179c9eced9a79c30 100644
--- a/src/uas/UASWaypointManager.cc
+++ b/src/uas/UASWaypointManager.cc
@@ -398,6 +398,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();