diff --git a/src/agent_map.c b/src/agent_map.c
index e32646a3beebd5dd38d5221eb498e978237bbb58..4877e26520db22eadda167a974851568e86a8fe4 100644
--- a/src/agent_map.c
+++ b/src/agent_map.c
@@ -390,7 +390,7 @@ int send_unassoc_sta_link_metrics_response(void *agent,
 
 	dbg("%s: --->\n", __func__);
 
-	radio = agent_get_radio_by_name(a, ap->ifname);
+	radio = agent_get_radio_by_band(a, ap->band);
 	if (!radio)
 		return -1;
 
@@ -5062,7 +5062,7 @@ static void agent_una_sta_meas_timer_cb(atimer_t *t)
 
 	dbg("agent: %s: --->\n", __func__);
 
-	radio = agent_get_radio_by_name(a, ap->ifname);
+	radio = agent_get_radio_by_band(a, ap->band);
 	if (!radio){
 		dbg("[%s:%d] Did not find radio, re-try\n", __func__, __LINE__);
 		timer_set(&ap->una_sta_meas_timer, UNA_STA_MEAS_TIMER);