diff --git a/re2o/utils.py b/re2o/utils.py
index 8a4e4553..75304369 100644
--- a/re2o/utils.py
+++ b/re2o/utils.py
@@ -340,20 +340,16 @@ def re2o_paginator(request, query_set, pagination_number):
     :request:
     :query_set: Query_set to paginate
     :pagination_number: Number of entries to display"""
-    if query_set.count() > pagination_number:
-        paginator = Paginator(query_set, pagination_number)
-        page = request.GET.get('page')
-        try:
-            results = paginator.page(page)
-        except PageNotAnInteger:
-            # If page is not an integer, deliver first page.
-            results = paginator.page(1)
-        except EmptyPage:
-            # If page is out of range (e.g. 9999), deliver last page of results.
-            results = paginator.page(paginator.num_pages)
-    else:
-        #If there is only one page, deliver the page without paginator
-        return query_set
+    paginator = Paginator(query_set, pagination_number)
+    page = request.GET.get('page')
+    try:
+        results = paginator.page(page)
+    except PageNotAnInteger:
+        # If page is not an integer, deliver first page.
+        results = paginator.page(1)
+    except EmptyPage:
+        # If page is out of range (e.g. 9999), deliver last page of results.
+        results = paginator.page(paginator.num_pages)
     return results
 
 
diff --git a/templates/pagination.html b/templates/pagination.html
index a3a51602..d0bb3801 100644
--- a/templates/pagination.html
+++ b/templates/pagination.html
@@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 {% load url_insert_param %}
 
+{% if list.paginator.num_pages > 1 %}
 <ul class="pagination nav navbar-nav">
     {% if list.has_previous %}
     <li><a href="{% url_insert_param request.get_full_path page=1 %}"> << </a></li>
@@ -39,5 +40,5 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <li><a href="{% url_insert_param request.get_full_path page=list.next_page_number %}"> > </a></li>
         <li><a href="{% url_insert_param request.get_full_path page=list.paginator.page_range|length %}"> >> </a></li>
     {% endif %}
- </ul>
-
+</ul>
+{% endif %}