diff --git a/library/includes/functions.php b/library/includes/functions.php
index 3bed8182d..069215fe3 100644
--- a/library/includes/functions.php
+++ b/library/includes/functions.php
@@ -1206,6 +1206,10 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add
     $total_pages = ceil($num_items / $per_page);
 
     if ($total_pages == 1 || $num_items == 0) {
+        $template->assign_vars(array(
+            'PAGINATION' => false,
+        ));
+
         return '';
     }
 
diff --git a/styles/templates/default/group.tpl b/styles/templates/default/group.tpl
index d75b78acc..e414df371 100644
--- a/styles/templates/default/group.tpl
+++ b/styles/templates/default/group.tpl
@@ -217,6 +217,7 @@
         <!-- END switch_mod_option -->
     </table>
 
+    <!-- IF PAGINATION -->
     <div class="bottom_info">
         <div class="nav">
             <p style="float: left">{PAGE_NUMBER}</p>
@@ -224,6 +225,7 @@
             <div class="clear"></div>
         </div>
     </div><!--/bottom_info-->
+    <!-- ENDIF -->
 
     <!-- IF PENDING_USERS -->
     <table class="forumline">
@@ -304,6 +306,7 @@
     </tfoot>
 </table>
 
+<!-- IF PAGINATION -->
 <div class="bottom_info">
     <div class="nav">
         <p style="float: left">{PAGE_NUMBER}</p>
@@ -311,6 +314,7 @@
         <div class="clear"></div>
     </div>
 </div>
+<!-- ENDIF -->
 <!-- ENDIF / RELEASES -->
 
 <!--========================================================================-->
diff --git a/styles/templates/default/memberlist.tpl b/styles/templates/default/memberlist.tpl
index 0d3efef3c..7af84503c 100644
--- a/styles/templates/default/memberlist.tpl
+++ b/styles/templates/default/memberlist.tpl
@@ -60,11 +60,13 @@
 
 <div class="bottom_info">
 
+    <!-- IF PAGINATION -->
 	<div class="nav">
 		<p style="float: left">{PAGE_NUMBER}</p>
 		<p style="float: right">{PAGINATION}</p>
 		<div class="clear"></div>
 	</div>
+    <!-- ENDIF -->
 
 	<div class="spacer_4"></div>
 
diff --git a/styles/templates/default/privmsgs.tpl b/styles/templates/default/privmsgs.tpl
index be85f06db..d4b27c5f4 100644
--- a/styles/templates/default/privmsgs.tpl
+++ b/styles/templates/default/privmsgs.tpl
@@ -106,11 +106,13 @@
 
 	<div class="spacer_6"></div>
 
+    <!-- IF PAGINATION -->
 	<div class="nav">
 		<p style="float: left">{PAGE_NUMBER}</p>
 		<p style="float: right">{PAGINATION}</p>
 		<div class="clear"></div>
 	</div>
+    <!-- ENDIF -->
 
 	<div class="spacer_4"></div>
 
diff --git a/styles/templates/default/search_results.tpl b/styles/templates/default/search_results.tpl
index 5f09466f4..19a8aa554 100644
--- a/styles/templates/default/search_results.tpl
+++ b/styles/templates/default/search_results.tpl
@@ -218,11 +218,13 @@ function show_edit_options ()
 
 <div class="bottom_info">
 
+    <!-- IF PAGINATION -->
 	<div class="nav">
 		<p style="float: left">{PAGE_NUMBER}</p>
 		<p style="float: right">{PAGINATION}</p>
 		<div class="clear"></div>
 	</div>
+    <!-- ENDIF -->
 
 	<div class="spacer_4"></div>
 
diff --git a/styles/templates/default/tracker.tpl b/styles/templates/default/tracker.tpl
index 3f0aa3feb..2bcefbf39 100644
--- a/styles/templates/default/tracker.tpl
+++ b/styles/templates/default/tracker.tpl
@@ -447,11 +447,13 @@ $(function(){
 
 <div class="bottom_info">
 
+    <!-- IF PAGINATION -->
 	<div class="nav">
 		<p style="float: left">{PAGE_NUMBER}</p>
 		<p style="float: right">{PAGINATION}</p>
 		<div class="clear"></div>
 	</div>
+    <!-- ENDIF -->
 
 	<div class="spacer_4"></div>
 
diff --git a/styles/templates/default/viewtopic.tpl b/styles/templates/default/viewtopic.tpl
index 4f420f478..4a993d0dd 100644
--- a/styles/templates/default/viewtopic.tpl
+++ b/styles/templates/default/viewtopic.tpl
@@ -547,6 +547,7 @@ function build_poll_add_form (src_el)
     </tr>
 </table>
 
+<!-- IF PAGINATION -->
 <table id="pagination" class="topic" cellpadding="0" cellspacing="0">
 <tr>
 	<td class="nav pad_6 {PG_ROW_CLASS}">
@@ -555,6 +556,7 @@ function build_poll_add_form (src_el)
 	</td>
 </tr>
 </table><!--/pagination-->
+<!-- ENDIF -->
 
 <!-- IF QUICK_REPLY -->
 <br>