diff --git a/src/mgmt.c b/src/mgmt.c
index ea1d2f3..d2d5da3 100644
--- a/src/mgmt.c
+++ b/src/mgmt.c
@@ -942,8 +942,14 @@ static void uuid_to_uuid128(uuid_t *uuid128, const uuid_t *uuid)
 
 static bool is_16bit_uuid(const uuid_t *uuid)
 {
+	static uint8_t any[16] = { 0, 0, 0, 0, 0, 0, 0, 0,
+					0, 0, 0, 0, 0, 0, 0, 0 };
 	uuid_t tmp;
 
+	if (uuid->type == SDP_UUID128 &&
+			memcmp(&uuid->value.uuid128, any, sizeof(any)) == 0)
+		return true;
+
 	uuid_to_uuid128(&tmp, uuid);
 
 	if (!sdp_uuid128_to_uuid(&tmp))