diff --git a/src/core/cntlr_map.c b/src/core/cntlr_map.c
index e322e3db46b68a9028fb36e69a00adddb667065b..ccfe6dda64d95fa0a80026f71ae595ed7f663cf9 100644
--- a/src/core/cntlr_map.c
+++ b/src/core/cntlr_map.c
@@ -408,7 +408,7 @@ int handle_ap_autoconfig_wsc(void *cntlr, struct cmdu_buff *rx_cmdu)
 		return -1;
 
 	list_for_each_entry(a, &c->cfg.policylist, list) {
-		if (!memcmp(rx_cmdu->dev_macaddr, a->agent_id, 6)) {
+		if (!memcmp(rx_cmdu->origin, a->agent_id, 6)) {
 			agent_found = true;
 			break;
 		}