diff --git a/src/ui/MAVLinkDecoder.cc b/src/ui/MAVLinkDecoder.cc
index 1c57209dabdd753039a235a2f3e279f5c5819371..57fa86546babac9015ef33b73b039e25e9d8e717 100644
--- a/src/ui/MAVLinkDecoder.cc
+++ b/src/ui/MAVLinkDecoder.cc
@@ -12,7 +12,8 @@ MAVLinkDecoder::MAVLinkDecoder(MAVLinkProtocol* protocol, QObject *parent) :
     messageFilter.insert(MAVLINK_MSG_ID_HEARTBEAT, false);
     messageFilter.insert(MAVLINK_MSG_ID_SYS_STATUS, false);
     messageFilter.insert(MAVLINK_MSG_ID_STATUSTEXT, false);
-    messageFilter.insert(MAVLINK_MSG_ID_COMMAND, false);
+    messageFilter.insert(MAVLINK_MSG_ID_COMMAND_SHORT, false);
+    messageFilter.insert(MAVLINK_MSG_ID_COMMAND_LONG, false);
     messageFilter.insert(MAVLINK_MSG_ID_COMMAND_ACK, false);
     messageFilter.insert(MAVLINK_MSG_ID_PARAM_SET, false);
     messageFilter.insert(MAVLINK_MSG_ID_PARAM_VALUE, false);