diff --git a/upnpsoap.c b/upnpsoap.c
index e81bb18..e0245dc 100644
--- a/upnpsoap.c
+++ b/upnpsoap.c
@@ -351,13 +351,13 @@ set_filter_flags(char *filter, struct upnphttp *h)
 	int samsung = client_types[h->req_client].flags & FLAG_SAMSUNG;
 
 	if( !filter || (strlen(filter) <= 1) ) {
-		if (strcmp(filter, "*") == 0 && samsung) {
-			return 0xFFFFFFFF;  /* We want FILTER_SEC_DCM_INFO */
-		} else {
-			/* Not the full 32 bits.  Skip vendor-specific stuff by default. */
-			return 0xFFFFFF;
-		}
+		/* Not the full 32 bits.  Skip vendor-specific stuff by default. */
+		flags = 0xFFFFFF;
+		if (samsung)
+			flags |= FILTER_SEC_CAPTION_INFO_EX | FILTER_SEC_DCM_INFO;
 	}
+	if (flags)
+		return flags;
 
 	if( samsung )
 		flags |= FILTER_DLNA_NAMESPACE;