diff --git a/src/core/cntlr_map.c b/src/core/cntlr_map.c
index 077ad38678f883a05d69aa0e5e707575fb25392a..67491ee3047bd846e02bf64d4e66b4501cfb0c72 100644
--- a/src/core/cntlr_map.c
+++ b/src/core/cntlr_map.c
@@ -210,6 +210,11 @@ int handle_ap_autoconfig_search(void *cntlr, struct cmdu_buff *rx_cmdu)
 		return -1;
 	}
 
+	if (!memcmp(aladdr_origin, c->almac, 6)) {
+		trace("%s: Discard ap-autoconfig search from self\n", __func__);
+		return -1;
+	}
+
 	if (tv[1][0]->data[0] != IEEE80211_ROLE_REGISTRAR) {
 		trace("%s: Discard ap-autoconfig search for role != registrar\n",
 			__func__);