diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc
index d43f05591378ca479d7fb24a05fa00c12c49f60c..75fb54d560b938c48a129e527cbd01f75dbe8df0 100644
--- a/src/uas/UAS.cc
+++ b/src/uas/UAS.cc
@@ -499,7 +499,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
             mavlink_msg_attitude_decode(&message, &attitude);
             quint64 time = getUnixReferenceTime(attitude.time_boot_ms);
 
-            if (message.compid == 201) emit attitudeChanged(this, message.compid, QGC::limitAngleToPMPIf(attitude.roll), QGC::limitAngleToPMPIf(attitude.pitch), QGC::limitAngleToPMPIf(attitude.yaw), time);
+            emit attitudeChanged(this, message.compid, QGC::limitAngleToPMPIf(attitude.roll), QGC::limitAngleToPMPIf(attitude.pitch), QGC::limitAngleToPMPIf(attitude.yaw), time);
 
             if (!wrongComponent)
             {
@@ -577,7 +577,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
             quint64 time = getUnixTime(pos.time_boot_ms);
 
             // Emit position always with component ID
-            if (message.compid == 201) emit localPositionChanged(this, message.compid, pos.x, pos.y, pos.z, time);
+            emit localPositionChanged(this, message.compid, pos.x, pos.y, pos.z, time);
 
 
             if (!wrongComponent)