diff --git a/inventory_provider/routes/classifier.py b/inventory_provider/routes/classifier.py
index be1349a42359b52eb2e91787af3f52c3e8187cfe..d56c5c2d43cc3eeda19a87135b170cbd7dd6258c 100644
--- a/inventory_provider/routes/classifier.py
+++ b/inventory_provider/routes/classifier.py
@@ -364,7 +364,9 @@ def get_trap_metadata(source_equipment, interface, circuit_id):
     if result:
         result = result.decode('utf-8')
     else:
-        result = {}
+        result = {
+            'locations': []
+        }
         top_level_services = []
 
         services = r.get(
@@ -377,6 +379,8 @@ def get_trap_metadata(source_equipment, interface, circuit_id):
                     top_level_services.extend(tls)
             if top_level_services:
                 result['related-services'] = top_level_services
+            l = [_location_from_service_dict(s) for s in result['services']]
+            result['locations'] += l
 
         gl = r.get('opsdb:geant_lambdas:%s' % circuit_id.lower())
         if gl: