diff --git a/apps/folders/models.py b/apps/folders/models.py
index a52578e158..cf234cf397 100644
--- a/apps/folders/models.py
+++ b/apps/folders/models.py
@@ -26,7 +26,7 @@ class Folder(models.Model):
 
     @property
     def documents(self):
-        return [folder_document.document for folder_document in self.folderdocument_set.all()]
+        return Document.objects.filter(folderdocument__folder=self)
 
     def remove_document(self, document):
         folder_document = self.folderdocument_set.get(document=document)