diff --git a/readthedocs/builds/views.py b/readthedocs/builds/views.py
index 87f097638dd..1cf0244113b 100644
--- a/readthedocs/builds/views.py
+++ b/readthedocs/builds/views.py
@@ -42,6 +42,7 @@ def get_context_data(self, **kwargs):
         context['filter'] = filter
         context['active_builds'] = active_builds
         context['versions'] = Version.objects.public(user=self.request.user, project=self.project)
+        context['build_qs'] = filter.qs
 
         try:
             redis = Redis.from_url(settings.BROKER_URL)
diff --git a/readthedocs/templates/builds/build_list.html b/readthedocs/templates/builds/build_list.html
index 96c990d3acd..9c1173fb9dd 100644
--- a/readthedocs/templates/builds/build_list.html
+++ b/readthedocs/templates/builds/build_list.html
@@ -45,7 +45,7 @@ <h3>
 
 <div id="build_list">
 
-        {% autopaginate filter.qs 15 %}
+        {% autopaginate build_qs 15 %}
 
         <!-- BEGIN builds list -->
         <div class="module">
diff --git a/readthedocs/templates/core/build_list_detailed.html b/readthedocs/templates/core/build_list_detailed.html
index fd1c692d99c..33b3b754a7a 100644
--- a/readthedocs/templates/core/build_list_detailed.html
+++ b/readthedocs/templates/core/build_list_detailed.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 {% load static %}
 
-          {% for build in filter.qs %}
+          {% for build in build_qs %}
           <li class="module-item col-span">
             <div id="build-{{ build.id }}">
                 <a href="{{ build.get_absolute_url }}"><span id="build-state">{% if build.state != 'finished' %}{{ build.get_state_display }} {% else %} {% if build.success %}{% trans "Passed" %}{% else %}{% trans "Failed" %}{% endif %}{% endif %}</span>