diff --git a/paperless.conf.example b/paperless.conf.example
index 2e7a79745..969666954 100644
--- a/paperless.conf.example
+++ b/paperless.conf.example
@@ -105,3 +105,6 @@ PAPERLESS_SHARED_SECRET=""
 # Override the default UTC time zone here
 #PAPERLESS_TIME_ZONE=America/Los_Angeles
 
+# Customize number of list items to show per page
+#PAPERLESS_LIST_PER_PAGE=50
+
diff --git a/src/documents/admin.py b/src/documents/admin.py
index 37a014426..d59cec0bd 100644
--- a/src/documents/admin.py
+++ b/src/documents/admin.py
@@ -56,7 +56,6 @@ class DocumentAdmin(admin.ModelAdmin):
     list_display = ("created", "title", "thumbnail", "correspondent", "tags_")
     list_filter = ("tags", "correspondent", MonthListFilter)
     ordering = ["-created", "correspondent"]
-    list_per_page = 25
 
     def created_(self, obj):
         return obj.created.date().strftime("%Y-%m-%d")
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 4dcfd0ab1..416513e57 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -61,10 +61,11 @@ INSTALLED_APPS = [
 
 ]
 
+_list_per_page = int(os.getenv("PAPERLESS_LIST_PER_PAGE", 25))
 SUIT_CONFIG = {
     'ADMIN_NAME': 'Paperless',
     'SEARCH_URL': '',
-    'LIST_PER_PAGE': 100,
+    'LIST_PER_PAGE': _list_per_page,
     'HEADER_DATE_FORMAT': 'D m-d-Y',
     'MENU': (
         'sites',