diff --git a/ChangeLog.md b/ChangeLog.md
index c35bf8f53720bc1bf673efad94d55b461c3f0f35..e01883f8d3e1db560faa9daf4eeed8bdeac9b5ed 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -8,6 +8,9 @@ Note: This file only contains high level features or important fixes.
 
 * Major rewrite and bug fix pass through Structure Scan. Previous version had such bad problems that it can no longer be supported. Plans with Structure Scan will need to be recreated. New QGC will not load old Structure Scan plans.
 
+### 3.5.5 - Not yet released
+* Fix mavlink message memset which cause wrong commands to be sent on ArduPilot GotoLocation.
+
 ### 3.5.4 - Stable
 * Update windows drivers
 * Add support for FMUK66 flashing/connection
diff --git a/src/MissionManager/MissionManager.cc b/src/MissionManager/MissionManager.cc
index e5fc3bd1ff83cd2dd837afca48da9b4660cb5175..198ee4d89b5a83ea45ddb73ce280ce1b043a3793 100644
--- a/src/MissionManager/MissionManager.cc
+++ b/src/MissionManager/MissionManager.cc
@@ -46,7 +46,7 @@ void MissionManager::writeArduPilotGuidedMissionItem(const QGeoCoordinate& gotoC
     mavlink_message_t       messageOut;
     mavlink_mission_item_t  missionItem;
 
-    memset(&missionItem, 8, sizeof(missionItem));
+    memset(&missionItem, 0, sizeof(missionItem));
     missionItem.target_system =     _vehicle->id();
     missionItem.target_component =  _vehicle->defaultComponentId();
     missionItem.seq =               0;