diff --git a/apps/documents/__init__.py b/apps/documents/__init__.py
index 64d9d8f4b5..80a851598e 100644
--- a/apps/documents/__init__.py
+++ b/apps/documents/__init__.py
@@ -100,7 +100,7 @@ register_model_list_columns(Document, [
                 reverse('document_thumbnail', args=[x.id]))
         },
         {'name':_(u'metadata'), 'attribute':
-            lambda x: u', '.join([u'%s - %s' % (metadata.metadata_type, metadata.value) for metadata in x.documentmetadata_set.all()])
+            lambda x: u', '.join([u'%s - %s' % (metadata.metadata_type, metadata.value) for metadata in x.documentmetadata_set.select_related('metadata_type', 'document').defer('document__document_type', 'document__file', 'document__description', 'document__file_filename', 'document__uuid', 'document__date_added', 'document__date_updated', 'document__file_mimetype', 'document__file_mime_encoding')])
         },
     ])