diff --git a/inventory_provider/routes/classifier.py b/inventory_provider/routes/classifier.py
index c29d2d8ed8c239d92e5e10c9e5de031d18e65dd9..ea9e4ca63ec294d4a5b9555ffa5199d6f103690b 100644
--- a/inventory_provider/routes/classifier.py
+++ b/inventory_provider/routes/classifier.py
@@ -272,11 +272,11 @@ def peer_info(address):
         if interfaces:
             result['interfaces'] = interfaces
 
-        if not result:
-            return Response(
-                response='no peering info found for %s' % address,
-                status=404,
-                mimetype="text/html")
+        # if not result:
+        #     return Response(
+        #         response='no peering info found for %s' % address,
+        #         status=404,
+        #         mimetype="text/html")
 
         result = json.dumps(result)
         # cache this data for the next call
diff --git a/test/test_classifier_routes.py b/test/test_classifier_routes.py
index b713132bce148fea693a0c1728d046e38bdf1a53..1aa3cece4fb0dccb5631fb85ea624cd05ea550b0 100644
--- a/test/test_classifier_routes.py
+++ b/test/test_classifier_routes.py
@@ -299,7 +299,9 @@ def test_peer_not_found(client):
     rv = client.get(
         '/classifier/peer-info/1.2.3.4',
         headers=DEFAULT_REQUEST_HEADERS)
-    assert rv.status_code == 404
+    assert rv.status_code == 200
+    response_data = json.loads(rv.data.decode('utf-8'))
+    assert response_data == {}
 
 
 @pytest.mark.parametrize('equipment,entity_name,card_id,port_number', [