diff --git a/ingestion/src/metadata/utils/elasticsearch.py b/ingestion/src/metadata/utils/elasticsearch.py
index 3b14f838bca..4e858601fb0 100644
--- a/ingestion/src/metadata/utils/elasticsearch.py
+++ b/ingestion/src/metadata/utils/elasticsearch.py
@@ -88,6 +88,9 @@ def get_entity_from_es_result(
     :param entity_list: ES query result
     :return: single entity
     """
+    if entity_list is None:
+        return None
+    entity_list = [e for e in entity_list if e is not None]
     if entity_list and len(entity_list):
         if fetch_multiple_entities:
             return entity_list