diff --git a/CHANGES.rst b/CHANGES.rst
index 8a757b9..47b61ba 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+Changes in version 0.8.9 (beta release)
+-------------------------------------------
+
+* Added workaround for large data sets, temporarily disabled pagination.
+  NOTE: this issue needs to be looked at in more depth, and is a quick fix only.
+
+
 Changes in version 0.8.8 (beta release)
 -------------------------------------------
 
diff --git a/polymorphic_tree/admin/parentadmin.py b/polymorphic_tree/admin/parentadmin.py
index 40b5ed0..8391e12 100644
--- a/polymorphic_tree/admin/parentadmin.py
+++ b/polymorphic_tree/admin/parentadmin.py
@@ -54,6 +54,11 @@ class PolymorphicMPTTParentModelAdmin(PolymorphicParentModelAdmin, MPTTModelAdmi
     # Config list page:
     list_filter = extra_list_filters
 
+    # TODO: disable the pagination in the admin, because it doesn't work with the current template code.
+    # This is a workaround for https://github.com/edoburu/django-polymorphic-tree/issues/2 until
+    # proper pagination code (or a different JavaScript frontend) is included to deal with the interrupted tree levels.
+    list_per_page = 10000
+
     EMPTY_ACTION_ICON = u'<span><img src="{static}polymorphic_tree/icons/blank.gif" width="16" height="16" alt=""/></span>'.format(static=settings.STATIC_URL)