diff --git a/inventory_provider/routes/classifier.py b/inventory_provider/routes/classifier.py
index 685b2764a056087bb6ad1fe11117ff430687ecf4..76bae8564c1557e34ea09fcc163f96c5a32d92db 100644
--- a/inventory_provider/routes/classifier.py
+++ b/inventory_provider/routes/classifier.py
@@ -144,9 +144,6 @@ def get_juniper_link_info(source_equipment, interface):
             'locations': []
         }
 
-        router_location = _location_from_router(source_equipment)
-        result['locations'] += [router_location]
-
         top_level_services = []
 
         services = r.get(
@@ -194,6 +191,9 @@ def get_juniper_link_info(source_equipment, interface):
         if top_level_services:
             result['related-services'] = top_level_services
 
+        if not result['locations']:
+            result['locations'] = [_location_from_router(source_equipment)]
+
         result['locations'] = _unique_dicts_from_list(result['locations'])
         result = json.dumps(result)
         # cache this data for the next call