diff --git a/src/core/views/list_views.py b/src/core/views/list_views.py
index 2dccab5dd93f34856e7c2eef4196e22ff4a09c5b..e5f1bc614fe0b102d87688c78e8772e562edb87b 100644
--- a/src/core/views/list_views.py
+++ b/src/core/views/list_views.py
@@ -30,6 +30,8 @@ class FilteredListView(ListView):
         """
         try:
             paginate_by = self.request.GET.get('paginate_by', self.paginate_by)
+            if paginate_by is None:
+                return self.paginate_by
             paginate_by = int(paginate_by)
         except ValueError:
             if str(paginate_by).lower() == 'all':