diff --git a/src/uas/UASWaypointManager.cc b/src/uas/UASWaypointManager.cc
index 2799323b98d8282b601e8ba38c75826c28d203e6..7ed06d8839ecab7164b377b4807b5b6a15fcfe03 100644
--- a/src/uas/UASWaypointManager.cc
+++ b/src/uas/UASWaypointManager.cc
@@ -132,7 +132,7 @@ void UASWaypointManager::handleGlobalPositionChanged(UASInterface* mav, double l
 
 void UASWaypointManager::handleWaypointCount(quint8 systemId, quint8 compId, quint16 count)
 {
-    if (current_state == WP_GETLIST && systemId == current_partner_systemid && ((compId == current_partner_compid || compId == MAV_COMP_ID_ALL) || compId == MAV_COMP_ID_ALL)) {
+    if (current_state == WP_GETLIST && systemId == current_partner_systemid && (compId == current_partner_compid || compId == MAV_COMP_ID_ALL)) {
         protocol_timer.start(PROTOCOL_TIMEOUT_MS);
         current_retries = PROTOCOL_MAX_RETRIES;