diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/core/discoveredapis.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/core/discoveredapis.py
index 37c113e68a534e2260da989b51469b1e0ca383e7..6ab0c458d1b08066d14201a2739ac53da5a5bc47 100644
--- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/core/discoveredapis.py
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/core/discoveredapis.py
@@ -58,7 +58,9 @@ class DiscoverApisOperations(Resource):
             for discoved_api in discoved_apis:
                 vendor_specific_fields_path = find_attribute_in_body(discoved_api, '')
                 if vend_spec_query_params_n_values and vendor_specific_fields_path:
-                    json_docs.append(filter_apis_with_vendor_specific_params(discoved_api, vend_spec_query_params_n_values, vendor_specific_fields_path))
+                    vs_filtered_apis = filter_apis_with_vendor_specific_params(discoved_api, vend_spec_query_params_n_values, vendor_specific_fields_path)
+                    if vs_filtered_apis:
+                        json_docs.append(vs_filtered_apis)
                 else:
                     json_docs.append(discoved_api)
 
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/vendor_specific.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/vendor_specific.py
index 84e8c361931bb3eadcbfff849afa7352c8fd93bf..d30faf3e6a5aeb58cb6ca7c810c26fc399181f99 100644
--- a/services/TS29222_CAPIF_Discover_Service_API/service_apis/vendor_specific.py
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/vendor_specific.py
@@ -69,8 +69,7 @@ def filter_apis_with_vendor_specific_params(discoved_api, vend_spec_query_params
                     v_2 = tmp_body[path_piece]
                     tmp_body = v_2
                 # Check if parameter exists in the field attributes!!!!
-                if tmp_body[vs_field][parts[1]] == v:
-                    json_docs.append(discoved_api)
-                else:
-                    continue
+                if parts[1] in tmp_body[vs_field].keys():
+                    if tmp_body[vs_field][parts[1]] == v:
+                        json_docs.append(discoved_api)
     return json_docs
\ No newline at end of file