diff --git a/templates/last_articles.html b/templates/last_articles.html
index bf00a91..121cbfa 100644
--- a/templates/last_articles.html
+++ b/templates/last_articles.html
@@ -1,6 +1,6 @@
 <h1 class="section-heading" style="font-variant: small-caps">Recent Articles</h1>
 {% for article in articles %}
-  {% if loop.index > 5 %}{% break %}{% endif %}
+  {% if loop.index > PAGE_PAGINATION %}{% break %}{% endif %}
     <div class="post-preview">
         <a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">
             <h2 class="post-title">
diff --git a/templates/page.html b/templates/page.html
index ff7fe09..f0d8bc8 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -28,7 +28,7 @@
 {% block content %}
     <article>
         {{ page.content }}
-        {% if page.article_list %}
+        {% if page.article_list and PAGE_PAGINATION > 0 %}
         <hr />
         {% include "last_articles.html" %}
         {% endif %}