diff --git a/mayan/apps/folders/api_views.py b/mayan/apps/folders/api_views.py
index 40c4a8aef7..ef25b8aecc 100644
--- a/mayan/apps/folders/api_views.py
+++ b/mayan/apps/folders/api_views.py
@@ -8,6 +8,7 @@ from rest_framework import generics
 from acls.models import AccessEntry
 from documents.models import Document
 from documents.permissions import PERMISSION_DOCUMENT_VIEW
+from documents.serializers import DocumentSerializer
 from permissions.models import Permission
 from rest_api.filters import MayanObjectPermissionsFilter
 from rest_api.permissions import MayanPermission
@@ -56,10 +57,7 @@ class APIFolderDocumentListView(generics.ListAPIView):
 
     filter_backends = (MayanObjectPermissionsFilter,)
     mayan_object_permissions = {'GET': [PERMISSION_DOCUMENT_VIEW]}
-
-    def get_serializer_class(self):
-        from documents.serializers import DocumentSerializer
-        return DocumentSerializer
+    serializer_class = FolderSerializer
 
     def get_queryset(self):
         folder = get_object_or_404(Folder, pk=self.kwargs['pk'])
diff --git a/mayan/apps/tags/api_views.py b/mayan/apps/tags/api_views.py
index 1f3d0dec00..e7e2ebf0bd 100644
--- a/mayan/apps/tags/api_views.py
+++ b/mayan/apps/tags/api_views.py
@@ -9,6 +9,7 @@ from taggit.models import Tag
 from acls.models import AccessEntry
 from documents.models import Document
 from documents.permissions import PERMISSION_DOCUMENT_VIEW
+from documents.serializers import DocumentSerializer
 from permissions.models import Permission
 from rest_api.filters import MayanObjectPermissionsFilter
 from rest_api.permissions import MayanPermission
@@ -47,10 +48,7 @@ class APITagDocumentListView(generics.ListAPIView):
 
     filter_backends = (MayanObjectPermissionsFilter,)
     mayan_object_permissions = {'GET': [PERMISSION_DOCUMENT_VIEW]}
-
-    def get_serializer_class(self):
-        from documents.serializers import DocumentSerializer
-        return DocumentSerializer
+    serializer_class = DocumentSerializer
 
     def get_queryset(self):
         tag = get_object_or_404(Tag, pk=self.kwargs['pk'])