diff --git a/apps/dynamic_search/templates/search/indexes/documents/document_text.txt b/apps/dynamic_search/templates/search/indexes/documents/document_text.txt
index a3a280a7ce..12ce19fa6f 100644
--- a/apps/dynamic_search/templates/search/indexes/documents/document_text.txt
+++ b/apps/dynamic_search/templates/search/indexes/documents/document_text.txt
@@ -11,5 +11,9 @@
 {{ object.file_mimetype }}
 {{ object.description|default:' ' }}
 {{ object.flat_comments }}
-{{ object.flat_tags }}
+
+{% for tag in object.tags.all %}
+    {{ tag }}
+{% endfor %}
+
 {{ object.uuid }}
diff --git a/apps/tags/__init__.py b/apps/tags/__init__.py
index 5263c3b240..2bfcb2f508 100644
--- a/apps/tags/__init__.py
+++ b/apps/tags/__init__.py
@@ -66,11 +66,4 @@ class_permissions(Tag, [
     PERMISSION_TAG_VIEW,
 ])
 
-
-def flat_tags(document):
-    return u' '.join(document.tags.values_list('name', flat=True))
-
-
 Document.add_to_class('tags', TaggableManager())
-Document.add_to_class('flat_tags', flat_tags)
-