diff --git a/ocw/tables.py b/ocw/tables.py
index cc300ea6..128c34c8 100644
--- a/ocw/tables.py
+++ b/ocw/tables.py
@@ -91,7 +91,12 @@ class Meta:
 
 # Create a BaseFilterSet to support initial value
 class BaseFilterSet(django_filters.FilterSet):
-    def __init__(self, data=None, *args, **kwargs):
+    def __init__(self, *args, **kwargs):
+        try:
+            data = kwargs.pop('data')
+            data = args.pop(0)
+        except (KeyError, IndexError):
+            data = None
         if data is not None:
             data = data.copy()
             for name, filter in self.base_filters.items():