diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc
index 174dce7b5357bc3f03275e87e5a0a9da7551b9fb..da9c88423a0b3925335e2121cd9bf5e99569f6f6 100644
--- a/src/uas/UAS.cc
+++ b/src/uas/UAS.cc
@@ -1003,6 +1003,55 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
                 emit remoteControlChannelRawChanged(channels.port * portWidth + 6, channels.chan7_raw);
             if (channels.chan8_raw != UINT16_MAX)
                 emit remoteControlChannelRawChanged(channels.port * portWidth + 7, channels.chan8_raw);
+        }
+            break;
+        case MAVLINK_MSG_ID_RC_CHANNELS:
+        {
+            mavlink_rc_channels_t channels;
+            mavlink_msg_rc_channels_decode(&message, &channels);
+
+            // UINT8_MAX indicates this value is unknown
+            if (channels.rssi != UINT8_MAX) {
+                emit remoteControlRSSIChanged(channels.rssi/100.0f);
+            }
+
+            if (channels.chan1_raw != UINT16_MAX && channels.chancount > 0)
+                emit remoteControlChannelRawChanged(0, channels.chan1_raw);
+            if (channels.chan2_raw != UINT16_MAX && channels.chancount > 1)
+                emit remoteControlChannelRawChanged(1, channels.chan2_raw);
+            if (channels.chan3_raw != UINT16_MAX && channels.chancount > 2)
+                emit remoteControlChannelRawChanged(2, channels.chan3_raw);
+            if (channels.chan4_raw != UINT16_MAX && channels.chancount > 3)
+                emit remoteControlChannelRawChanged(3, channels.chan4_raw);
+            if (channels.chan5_raw != UINT16_MAX && channels.chancount > 4)
+                emit remoteControlChannelRawChanged(4, channels.chan5_raw);
+            if (channels.chan6_raw != UINT16_MAX && channels.chancount > 5)
+                emit remoteControlChannelRawChanged(5, channels.chan6_raw);
+            if (channels.chan7_raw != UINT16_MAX && channels.chancount > 6)
+                emit remoteControlChannelRawChanged(6, channels.chan7_raw);
+            if (channels.chan8_raw != UINT16_MAX && channels.chancount > 7)
+                emit remoteControlChannelRawChanged(7, channels.chan8_raw);
+            if (channels.chan9_raw != UINT16_MAX && channels.chancount > 8)
+                emit remoteControlChannelRawChanged(8, channels.chan9_raw);
+            if (channels.chan10_raw != UINT16_MAX && channels.chancount > 9)
+                emit remoteControlChannelRawChanged(9, channels.chan10_raw);
+            if (channels.chan11_raw != UINT16_MAX && channels.chancount > 10)
+                emit remoteControlChannelRawChanged(10, channels.chan11_raw);
+            if (channels.chan12_raw != UINT16_MAX && channels.chancount > 11)
+                emit remoteControlChannelRawChanged(11, channels.chan12_raw);
+            if (channels.chan13_raw != UINT16_MAX && channels.chancount > 12)
+                emit remoteControlChannelRawChanged(12, channels.chan13_raw);
+            if (channels.chan14_raw != UINT16_MAX && channels.chancount > 13)
+                emit remoteControlChannelRawChanged(13, channels.chan14_raw);
+            if (channels.chan15_raw != UINT16_MAX && channels.chancount > 14)
+                emit remoteControlChannelRawChanged(14, channels.chan15_raw);
+            if (channels.chan16_raw != UINT16_MAX && channels.chancount > 15)
+                emit remoteControlChannelRawChanged(15, channels.chan16_raw);
+            if (channels.chan17_raw != UINT16_MAX && channels.chancount > 16)
+                emit remoteControlChannelRawChanged(16, channels.chan17_raw);
+            if (channels.chan18_raw != UINT16_MAX && channels.chancount > 17)
+                emit remoteControlChannelRawChanged(17, channels.chan18_raw);
+
         }
             break;
         case MAVLINK_MSG_ID_RC_CHANNELS_SCALED:
@@ -1444,9 +1493,6 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
             break;
 
 #endif
-            // Messages to ignore
-        case MAVLINK_MSG_ID_RAW_IMU:
-        case MAVLINK_MSG_ID_SCALED_IMU:
         case MAVLINK_MSG_ID_NAV_CONTROLLER_OUTPUT:
         {
             //mavlink_set_local_position_setpoint_t p;
@@ -1462,6 +1508,9 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
             emit navigationControllerErrorsChanged(this, p.alt_error, p.aspd_error, p.xtrack_error);
         }
             break;
+        // Messages to ignore
+        case MAVLINK_MSG_ID_RAW_IMU:
+        case MAVLINK_MSG_ID_SCALED_IMU:
         case MAVLINK_MSG_ID_RAW_PRESSURE:
         case MAVLINK_MSG_ID_SCALED_PRESSURE:
         case MAVLINK_MSG_ID_OPTICAL_FLOW: