diff --git a/src/FirmwarePlugin/APM/MavCmdInfoCommon.json b/src/FirmwarePlugin/APM/MavCmdInfoCommon.json
index f7a29ac149a3a3fd11198608c64b9ae969850d65..845b4cc51a4d7fd3b295b4b814712f8dca96efc7 100644
--- a/src/FirmwarePlugin/APM/MavCmdInfoCommon.json
+++ b/src/FirmwarePlugin/APM/MavCmdInfoCommon.json
@@ -4,6 +4,11 @@
     "version": 1,
 
     "mavCmdInfo": [
+        {
+            "id":           16,
+            "comment":      "MAV_CMD_NAV_WAYPOINT",
+            "paramRemove":  "2"
+        },
         {
             "id":                   84,
             "comment":              "MAV_CMD_NAV_VTOL_TAKEOFF",
diff --git a/src/FirmwarePlugin/PX4/MavCmdInfoCommon.json b/src/FirmwarePlugin/PX4/MavCmdInfoCommon.json
index 059e49a77b98f29076f837ea6bef5aa2bc2138e1..16165043003c783f2b6673d25757c0d677a59613 100644
--- a/src/FirmwarePlugin/PX4/MavCmdInfoCommon.json
+++ b/src/FirmwarePlugin/PX4/MavCmdInfoCommon.json
@@ -4,5 +4,10 @@
     "version": 1,
 
     "mavCmdInfo": [
+        {
+            "id":           16,
+            "comment":      "MAV_CMD_NAV_WAYPOINT",
+            "paramRemove":  "2,3,4"
+        }
     ]
 }
diff --git a/src/FirmwarePlugin/PX4/MavCmdInfoFixedWing.json b/src/FirmwarePlugin/PX4/MavCmdInfoFixedWing.json
index d66a21757ae0b9f34d71a0afff347856ecb9b5ae..b595e720f191e84183988f38c40360eb81de929f 100644
--- a/src/FirmwarePlugin/PX4/MavCmdInfoFixedWing.json
+++ b/src/FirmwarePlugin/PX4/MavCmdInfoFixedWing.json
@@ -4,11 +4,6 @@
     "version": 1,
 
     "mavCmdInfo": [
-        {
-            "id":           16,
-            "comment":      "MAV_CMD_NAV_WAYPOINT",
-            "paramRemove":  "3,4"
-        },
         {
             "id":           21,
             "comment":      "MAV_CMD_NAV_LAND",