diff --git a/mayan/apps/folders/serializers.py b/mayan/apps/folders/serializers.py
index f574de5906..100fb91b91 100644
--- a/mayan/apps/folders/serializers.py
+++ b/mayan/apps/folders/serializers.py
@@ -6,6 +6,15 @@ from .models import Folder
 
 
 class FolderSerializer(serializers.HyperlinkedModelSerializer):
+    # FIXME: Doing a: from documents.serializers import DocumentSerializer
+    # causes an unexplained ImportError, so we import it hidden until the issue
+    # is resolved
+
+    def __init__(self, *args, **kwargs):
+        from documents.serializers import DocumentSerializer
+        super(FolderSerializer, self).__init__(*args, **kwargs)
+        self.fields['documents'] = DocumentSerializer()
+
     class Meta:
         fields = ('id', 'url', 'title', 'user', 'datetime_created')
         model = Folder
diff --git a/mayan/apps/tags/serializers.py b/mayan/apps/tags/serializers.py
index e6b44b5d10..36d6217648 100644
--- a/mayan/apps/tags/serializers.py
+++ b/mayan/apps/tags/serializers.py
@@ -5,6 +5,15 @@ from taggit.models import Tag
 
 
 class TagSerializer(serializers.HyperlinkedModelSerializer):
+    # FIXME: Doing a: from documents.serializers import DocumentSerializer
+    # causes an unexplained ImportError, so we import it hidden until the issue
+    # is resolved
+
+    def __init__(self, *args, **kwargs):
+        from documents.serializers import DocumentSerializer
+        super(TagSerializer, self).__init__(*args, **kwargs)
+        self.fields['documents'] = DocumentSerializer()
+
     color = serializers.CharField(source='properties.get.color')
 
     class Meta: