diff --git a/inventory_provider/routes/classifier.py b/inventory_provider/routes/classifier.py
index c4aaf73fee717ac24964ccde4e0432cae8586fc1..cf7fe977c982c03d197f81193ec0cd00fa8b7321 100644
--- a/inventory_provider/routes/classifier.py
+++ b/inventory_provider/routes/classifier.py
@@ -110,7 +110,6 @@ def get_juniper_link_info(source_equipment, interface):
             }
 
         def _related_services():
-            all_rs = []
             for related in related_interfaces(source_equipment, interface):
                 rs = r.get('opsdb:interface_services:%s:%s'
                            % (source_equipment, related))
@@ -118,15 +117,14 @@ def get_juniper_link_info(source_equipment, interface):
                     for s in json.loads(rs.decode('utf-8')):
                         top_level_services.extend(
                             get_top_level_services(s['id'], r))
-                        all_rs.append(
-                            {
-                                'name': s['name'],
-                                'status': s['status'],
-                                'circuit_type': s['circuit_type']
-                            })
-            return all_rs
-
-        related_services = _related_services()
+                        yield {
+                            'name': s['name'],
+                            'status': s['status'],
+                            'circuit_type': s['circuit_type'],
+                            'project': s['project']
+                        }
+
+        related_services = list(_related_services())
         if related_services:
             top_level_services.extend(related_services)
         if top_level_services: