diff --git a/src/cntlr_map.c b/src/cntlr_map.c
index 1c01f09535e07146bc265db30e427d18ab393038..61f863485505c52f53276eb8d97d888febeac24e 100644
--- a/src/cntlr_map.c
+++ b/src/cntlr_map.c
@@ -653,7 +653,7 @@ int handle_ap_autoconfig_search(void *cntlr, struct cmdu_buff *rx_cmdu)
 						"enabled", "0",
 						UCI_TYPE_STRING);
 
-				res = ubus_lookup_id(c->bus, "uci", &uci_obj);
+				res = bus_wait_for_object_timeout(c->bus, "uci", 0, &uci_obj);
 				if (!res) {
 					struct blob_buf bb = {0};
 
@@ -758,7 +758,7 @@ int handle_ap_autoconfig_response(void *cntlr, struct cmdu_buff *rx_cmdu)
 		trace("Disable and exit\n");
 		set_value_by_string("mapcontroller", "controller", "enabled", "0",
 				UCI_TYPE_STRING);
-		res = ubus_lookup_id(c->bus, "uci", &uci_obj);
+		res = bus_wait_for_object_timeout(c->bus, "uci", 0, &uci_obj);
 		if (!res) {
 			struct blob_buf bb = {0};