diff --git a/src/modules/navigator/navigator_main.cpp b/src/modules/navigator/navigator_main.cpp
index 25d4fdc4f7..8d3d494de1 100644
--- a/src/modules/navigator/navigator_main.cpp
+++ b/src/modules/navigator/navigator_main.cpp
@@ -928,9 +928,12 @@ Navigator::publish_mission_result()
 		_mission_result_pub = orb_advertise(ORB_ID(mission_result), &_mission_result);
 	}
 
+	// Don't reset current waypoint because it won't be updated e.g. if not in mission mode
+	// however, the current is still valid and therefore helpful for ground stations.
+	//_mission_result.seq_current = 0;
+
 	/* reset some of the flags */
 	_mission_result.seq_reached = false;
-	_mission_result.seq_current = 0;
 	_mission_result.item_do_jump_changed = false;
 	_mission_result.item_changed_index = 0;
 	_mission_result.item_do_jump_remaining = 0;