diff --git a/ietf/doc/models.py b/ietf/doc/models.py
index 0f7eb2444..b87448dff 100644
--- a/ietf/doc/models.py
+++ b/ietf/doc/models.py
@@ -512,12 +512,7 @@ class DocumentInfo(models.Model):
         return list(set([x.target for x in self.all_relations_that_doc(relationship)]))
 
     def replaces(self):
-        return set([ d for r in self.related_that_doc("replaces") for d in r.docs.all() ])
-
-    def replaces_name(self):
-        s = set([ r.document for r in self.related_that_doc("replaces")])
-        first = list(s)[0] if s else None
-        return None if first is None else first.filename_with_rev()
+        return self.related_that_doc("replaces")
 
     def replaced_by(self):
         return set([ r.document for r in self.related_that("replaces") ])
diff --git a/ietf/templates/doc/search/search_result_row.html b/ietf/templates/doc/search/search_result_row.html
index f6d7975dc..57ad1f01a 100644
--- a/ietf/templates/doc/search/search_result_row.html
+++ b/ietf/templates/doc/search/search_result_row.html
@@ -110,7 +110,9 @@
             {% if doc.rev != "00" %}
                 <a href="{{ rfcdiff_base_url }}?url2={{ doc.name }}-{{ doc.rev }}">
             {% elif doc.replaces %}
-                <a href="{{ rfcdiff_base_url }}?url1={{ doc.replaces_name }}&amp;url2={{ doc.name }}-{{ doc.rev }}">
+                {% with first_replaces=doc.replaces|first %}
+                    <a href="{{ rfcdiff_base_url }}?url1={{ first_replaces.name }}&amp;url2={{ doc.name }}-{{ doc.rev }}">
+                {% endwith %}
             {% endif %}
         {% endif %}
         {% if doc.type_id == "rfc" %}