diff --git a/thermometer/manager.c b/thermometer/manager.c
index 6b98bca..9dfbbe8 100644
--- a/thermometer/manager.c
+++ b/thermometer/manager.c
@@ -34,16 +34,27 @@
 
 static DBusConnection *connection = NULL;
 
+static gint primary_uuid_cmp(gconstpointer a, gconstpointer b)
+{
+	const struct att_primary *prim = a;
+	const char *uuid = b;
+
+	return g_strcmp0(prim->uuid, uuid);
+}
+
 static int thermometer_driver_probe(struct btd_device *device, GSList *uuids)
 {
 	struct att_primary *tattr;
-	GSList *list;
+	GSList *primaries, *l;
+
+	primaries = btd_device_get_primaries(device);
 
-	list = device_services_from_record(device, uuids);
-	if (list == NULL)
+	l = g_slist_find_custom(primaries, HEALTH_THERMOMETER_UUID,
+							primary_uuid_cmp);
+	if (l == NULL)
 		return -EINVAL;
 
-	tattr = list->data;
+	tattr = l->data;
 
 	return thermometer_register(connection, device, tattr);
 }