diff --git a/templates/bulletproof/entries.tpl b/templates/bulletproof/entries.tpl
index 143bf521..5a8a70a7 100644
--- a/templates/bulletproof/entries.tpl
+++ b/templates/bulletproof/entries.tpl
@@ -418,14 +418,6 @@
 
     {if $template_option.show_pagination == 'true' && $footer_totalPages > 1}
         <div class="pagination">
-            {assign var="archiveSortStable" value="`serendipity_getConfigVar key='archiveSortStable'`"}
-            {if $archiveSortStable}
-                {assign var="linkPrevPage" value="`$footer_next_page`"}
-                {assign var="linkNextPage" value="`$footer_prev_page`"}
-            {else}
-                {assign var="linkPrevPage" value="`$footer_prev_page`"}
-                {assign var="linkNextPage" value="`$footer_next_page`"}
-            {/if}
             {assign var="paginationStartPage" value="`$footer_currentPage-3`"}
             {if $footer_currentPage+3 > $footer_totalPages}
                 {assign var="paginationStartPage" value="`$footer_totalPages-6`"}
@@ -433,8 +425,8 @@
             {if $paginationStartPage <= 0}
                 {assign var="paginationStartPage" value="1"}
             {/if}
-            {if $linkPrevPage}
-                <a title="{$CONST.PREVIOUS_PAGE}" href="{$linkPrevPage}"><span class="pagearrow">&#9668;</span></a>
+            {if $footer_prev_page}
+                <a title="{$CONST.PREVIOUS_PAGE}" href="{$footer_prev_page}"><span class="pagearrow">&#9668;</span></a>
             {/if}
             {if $paginationStartPage > 1}
                 <a href="{$footer_pageLink|replace:'%s':'1'}">1</a>
@@ -455,8 +447,8 @@
             {if $smarty.section.i.index <= $footer_totalPages}
                 <a href="{$footer_pageLink|replace:'%s':$footer_totalPages}">{$footer_totalPages}</a>
             {/if}
-            {if $linkNextPage}
-                <a title="{$CONST.NEXT_PAGE}" href="{$linkNextPage}"><span class="pagearrow">&#9658;</span></a>
+            {if $footer_next_page}
+                <a title="{$CONST.NEXT_PAGE}" href="{$footer_next_page}"><span class="pagearrow">&#9658;</span></a>
             {/if}
         </div>
     {/if}
diff --git a/templates/timeline/entries.tpl b/templates/timeline/entries.tpl
index 2f9c641f..dcb2ce06 100644
--- a/templates/timeline/entries.tpl
+++ b/templates/timeline/entries.tpl
@@ -285,14 +285,6 @@
             
         {if $footer_totalPages >1 }
             <nav class="pagination">
-                {assign var="archiveSortStable" value="`serendipity_getConfigVar key='archiveSortStable'`"}
-                {if $archiveSortStable}
-                    {assign var="linkPrevPage" value="`$footer_next_page`"}
-                    {assign var="linkNextPage" value="`$footer_prev_page`"}
-                {else}
-                    {assign var="linkPrevPage" value="`$footer_prev_page`"}
-                    {assign var="linkNextPage" value="`$footer_next_page`"}
-                {/if}
                 {assign var="paginationStartPage" value="`$footer_currentPage-3`"}
                 {if $footer_currentPage+3 > $footer_totalPages}
                     {assign var="paginationStartPage" value="`$footer_totalPages-4`"}
@@ -300,8 +292,8 @@
                 {if $paginationStartPage <= 0}
                     {assign var="paginationStartPage" value="1"}
                 {/if}
-                {if $linkPrevPage}
-                    <a class="btn btn-md btn-default btn-theme" title="{$CONST.PREVIOUS_PAGE}" href="{$linkPrevPage}"><i class="fas fa-arrow-left" aria-hidden="true"></i><span class="sr-only">{$CONST.PREVIOUS_PAGE}</span></a>
+                {if $footer_prev_page}
+                    <a class="btn btn-md btn-default btn-theme" title="{$CONST.PREVIOUS_PAGE}" href="{$footer_prev_page}"><i class="fas fa-arrow-left" aria-hidden="true"></i><span class="sr-only">{$CONST.PREVIOUS_PAGE}</span></a>
                 {/if}
                 {if $paginationStartPage > 1}
                     <a class="btn btn-md btn-default btn-theme" href="{'1'|string_format:$footer_pageLink}">1</a>
@@ -322,8 +314,8 @@
                 {if $smarty.section.i.index <= $footer_totalPages}
                     <a class="btn btn-md btn-default btn-theme" href="{$footer_totalPages|string_format:$footer_pageLink}">{$footer_totalPages}</a>
                 {/if}
-                {if $linkNextPage}
-                    <a class="btn btn-md btn-default btn-theme" title="{$CONST.NEXT_PAGE}" href="{$linkNextPage}"><i class="fas fa-arrow-right" aria-hidden="true"></i><span class="sr-only">{$CONST.NEXT_PAGE}</span></a>
+                {if $footer_next_page}
+                    <a class="btn btn-md btn-default btn-theme" title="{$CONST.NEXT_PAGE}" href="{$footer_next_page}"><i class="fas fa-arrow-right" aria-hidden="true"></i><span class="sr-only">{$CONST.NEXT_PAGE}</span></a>
                 {/if}
             </nav>
         {/if}
diff --git a/templates/timeline/index.tpl b/templates/timeline/index.tpl
index 8f5fd10d..a2c78086 100644
--- a/templates/timeline/index.tpl
+++ b/templates/timeline/index.tpl
@@ -114,14 +114,6 @@
             
             {if $footer_totalPages >1 && !isset($staticpage_pagetitle)}
                 <nav class="pagination pull-right">
-                    {assign var="archiveSortStable" value="`serendipity_getConfigVar key='archiveSortStable'`"}
-                    {if $archiveSortStable}
-                        {assign var="linkPrevPage" value="`$footer_next_page`"}
-                        {assign var="linkNextPage" value="`$footer_prev_page`"}
-                    {else}
-                        {assign var="linkPrevPage" value="`$footer_prev_page`"}
-                        {assign var="linkNextPage" value="`$footer_next_page`"}
-                    {/if}
                     {assign var="paginationStartPage" value="`$footer_currentPage-3`"}
                     {if $footer_currentPage+3 > $footer_totalPages}
                         {assign var="paginationStartPage" value="`$footer_totalPages-4`"}
@@ -129,8 +121,8 @@
                     {if $paginationStartPage <= 0}
                         {assign var="paginationStartPage" value="1"}
                     {/if}
-                    {if $linkPrevPage}
-                        <a class="btn btn-md btn-default btn-theme" title="{$CONST.PREVIOUS_PAGE}" href="{$linkPrevPage}"><i class="fa fa-arrow-left" aria-hidden="true"></i><span class="sr-only">{$CONST.PREVIOUS_PAGE}</span></a>
+                    {if $footer_prev_page}
+                        <a class="btn btn-md btn-default btn-theme" title="{$CONST.PREVIOUS_PAGE}" href="{$footer_prev_page}"><i class="fa fa-arrow-left" aria-hidden="true"></i><span class="sr-only">{$CONST.PREVIOUS_PAGE}</span></a>
                     {/if}
                     {if $paginationStartPage > 1}
                         <a class="btn btn-md btn-default btn-theme" href="{'1'|string_format:$footer_pageLink}">1</a>
@@ -151,8 +143,8 @@
                     {if $smarty.section.i.index <= $footer_totalPages}
                         <a class="btn btn-md btn-default btn-theme" href="{$footer_totalPages|string_format:$footer_pageLink}">{$footer_totalPages}</a>
                     {/if}
-                    {if $linkNextPage}
-                        <a class="btn btn-md btn-default btn-theme" title="{$CONST.NEXT_PAGE}" href="{$linkNextPage}"><i class="fa fa-arrow-right" aria-hidden="true"></i><span class="sr-only">{$CONST.NEXT_PAGE}</span></a>
+                    {if $footer_next_page}
+                        <a class="btn btn-md btn-default btn-theme" title="{$CONST.NEXT_PAGE}" href="{$footer_next_page}"><i class="fa fa-arrow-right" aria-hidden="true"></i><span class="sr-only">{$CONST.NEXT_PAGE}</span></a>
                     {/if}
                 </nav>
             {/if}