diff --git a/wherehows-etl/src/main/resources/jython/EspressoExtract.py b/wherehows-etl/src/main/resources/jython/EspressoExtract.py
index 1e8c0b1ffc..76ad82c6b2 100644
--- a/wherehows-etl/src/main/resources/jython/EspressoExtract.py
+++ b/wherehows-etl/src/main/resources/jython/EspressoExtract.py
@@ -81,10 +81,10 @@ class EspressoExtract:
         fabric = 'PROD'
       elif 'CORP' in value['fabrics']:
         fabric = 'CORP'
-      elif 'EI' in value['fabrics']:
-        fabric = 'EI'
       else:
-        fabric = value['fabrics'][0]
+        self.logger.info("Skip fetching: " + name)
+        continue
+
       sub_type = value['subType'] if value['subType'] > '' else ''
 
       req_params = 'NuageDatabaseName={}&fabric={}&type={}&subType={}'.format(name, fabric, 'ESPRESSO', sub_type)