diff --git a/src/collector/cmdu.c b/src/collector/cmdu.c
index f894611ec3b6485a8eec8f567a8e4854ace61428..0257f52a6af81617825b911cbbbbbed0a92b74ae 100644
--- a/src/collector/cmdu.c
+++ b/src/collector/cmdu.c
@@ -154,10 +154,11 @@ int decollector_send_cmdu_request(struct decollector_private *priv, struct cmdu_
 		fprintf(stderr, "%s: msg-id = %hu\n", __func__, msgid);
 
 		/* Don't enqueue message id for autoconfig search &
-		 * channel selection request
+		 * channel selection request & client capability query
 		 */
 		if ((message_type == CMDU_TYPE_AP_AUTOCONFIGURATION_SEARCH) ||
-				(message_type == CMDU_CHANNEL_SELECTION_REQ))
+				(message_type == CMDU_CHANNEL_SELECTION_REQ) ||
+				(message_type == CMDU_CLIENT_CAPABILITY_QUERY))
 			goto out;
 
 		/* Store mid of the sent CMDU with an expected response type.
@@ -1983,7 +1984,6 @@ int decollector_handle_map_sta_event(struct decollector_private *p, struct cmdu_
 	bool is_known_src = false;
 	struct wifi_network_device *dev = NULL;
 	uint16_t message_type = cmdu_get_type(cmdu);
-	uint16_t mid = cmdu_get_mid(cmdu);
 
 	if (!p->dm)
 		return -1;
@@ -2009,13 +2009,6 @@ int decollector_handle_map_sta_event(struct decollector_private *p, struct cmdu_
 		break;
 
 	case CMDU_CLIENT_CAPABILITY_REPORT:
-		ret = cmdu_ackq_dequeue(&p->cmdu_ack_q, message_type,
-				mid, cmdu->origin, NULL);
-		if (ret) {
-			fprintf(stderr, "drop unexpected CMDU (mid = %d)\n",
-					mid);
-			return ret;
-		}
 		ret = fill_client_capability(p, cmdu, dev);
 		break;
 	}