diff --git a/src/common/kiwix/searcher.cpp b/src/common/kiwix/searcher.cpp
index 26ab55e0..50b3860c 100644
--- a/src/common/kiwix/searcher.cpp
+++ b/src/common/kiwix/searcher.cpp
@@ -215,7 +215,7 @@ namespace kiwix {
     oData["resultStart"] = this->resultStart + 1;
     oData["resultEnd"] = (this->resultEnd > this->estimatedResultCount ? this->estimatedResultCount : this->resultEnd);
     oData["resultRange"] = this->resultRange;
-    oData["resultLastPageStart"] = this->estimatedResultCount - this->resultRange;
+    oData["resultLastPageStart"] = this->estimatedResultCount > this->resultRange ? this->estimatedResultCount - this->resultRange : 0;
     oData["protocolPrefix"] = this->protocolPrefix;
     oData["searchProtocolPrefix"] = this->searchProtocolPrefix;
 
diff --git a/static/results.tmpl b/static/results.tmpl
index a6711f80..ee002301 100644
--- a/static/results.tmpl
+++ b/static/results.tmpl
@@ -114,13 +114,13 @@
 
   <div class="footer">
     <ul>
-      <TMPL_if (count>resultRange)>
+      <TMPL_if (resultLastPageStart>0)>
 	<li><a href="<TMPL_var searchProtocolPrefix>pattern=<TMPL_var searchPattern>&start=0&end=<TMPL_var resultRange>">◀</a></li>
       </TMPL_if>
       <TMPL_loop pages>
       <li><a <TMPL_if selected>class="selected"</TMPL_if> href="<TMPL_var searchProtocolPrefix>pattern=<TMPL_var searchPattern>&start=<TMPL_var start>&end=<TMPL_var end>"><TMPL_var label></a></li>
       </TMPL_LOOP>
-      <TMPL_if (count>resultRange)>
+      <TMPL_if (resultLastPageStart>0)>
 	<li><a href="<TMPL_var searchProtocolPrefix>pattern=<TMPL_var searchPattern>&start=<TMPL_var resultLastPageStart>&end=<TMPL_var (resultLastPageStart+resultRange)>">▶</a></li>
       </TMPL_if>
     </ul>