diff --git a/stack/sdp/sdp_api.c b/stack/sdp/sdp_api.c
index 9b3628c..533b61b 100644
--- a/stack/sdp/sdp_api.c
+++ b/stack/sdp/sdp_api.c
@@ -526,10 +526,10 @@
 
                     }
 
-                    if ((SDP_DISC_ATTR_TYPE(p_sattr->attr_len_type) == UUID_DESC_TYPE)
-                        && (SDP_DISC_ATTR_LEN(p_sattr->attr_len_type) == 2)
+                    if (SDP_DISC_ATTR_TYPE(p_sattr->attr_len_type) == UUID_DESC_TYPE && (service_uuid == 0
+                        || (SDP_DISC_ATTR_LEN(p_sattr->attr_len_type) == 2
+                            && p_sattr->attr_value.v.u16 == service_uuid)))
                         /* for a specific uuid, or any one */
-                        && ((p_sattr->attr_value.v.u16 == service_uuid) || service_uuid == 0))
                     {
                         return(p_rec);
                     }