diff --git a/src/stkutil.c b/src/stkutil.c
index acb4737b..fe9d45c7 100644
--- a/src/stkutil.c
+++ b/src/stkutil.c
@@ -1337,13 +1337,16 @@ static gboolean parse_dataobj_service_search(
 	const unsigned char *data;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
 
-	if (len < 1)
+	if (len < 2)
 		return FALSE;
 
-	if (len == 1)
-		return TRUE;
-
 	data = comprehension_tlv_iter_get_data(iter);
+
+	/* According to TS 102.223, everything except BT & IRDA is RFU */
+	if (data[0] != STK_TECHNOLOGY_BLUETOOTH &&
+			data[0] != STK_TECHNOLOGY_IRDA)
+		return FALSE;
+
 	ss->tech_id = data[0];
 	ss->len = len - 1;