diff --git a/src/core/agent.c b/src/core/agent.c
index e0e15b55faab3668a550a062e558965d93068e09..c55c1928a6b234c27673e7f2512e81a61e01cc06 100644
--- a/src/core/agent.c
+++ b/src/core/agent.c
@@ -3227,6 +3227,13 @@ static void agent_dispatch_autoconfig(struct uloop_timeout *t)
struct cmdu_cstruct *cmdu;
struct wifi_radio_element *radio = &a->radios[i];
+ if (radio->onboarded) {
+ dbg("radio %s has been onboarded, don't trigger search\n",
+ radio->name);
+ continue;
+ }
+
+
cmdu = agent_gen_ap_autoconfig_search(a, radio, NULL, 0x02);
if (!cmdu)
continue;