diff --git a/templates/base.html b/templates/base.html
index c6531af..b7d0dd6 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -94,7 +94,7 @@
               {% set PAGES_SORT_ATTRIBUTE = 'title' %}
           {%- endif %}
           {% for page in pages|sort(attribute=PAGES_SORT_ATTRIBUTE) %}
-          <li><a href="{{ SITEURL }}/{{ page.url }}#{{ page.slug }}">{{ page.title }}</a></li>
+          <li><a href="{{ SITEURL }}/{{ page.url }}{% if not DISABLE_HASH_URL %}#{{ page.slug }}{% endif %}">{{ page.title }}</a></li>
           {% endfor %}
 
           {% for name, link in LINKS %}
diff --git a/templates/index.html b/templates/index.html
index a283c88..39085b3 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -15,7 +15,7 @@
 {% for article in articles_page.object_list %}
 <article>
   <header>
-    <h2><a href="{{ SITEURL }}/{{ article.url }}#{{ article.slug }}">{{ article.title }}</a></h2>
+    <h2><a href="{{ SITEURL }}/{{ article.url }}{% if not DISABLE_HASH_URL %}#{{ article.slug }}{% endif %}">{{ article.title }}</a></h2>
     <p>
       {{ _('Posted on %(when)s in %(category)s',
            when=article.locale_date,
@@ -37,7 +37,7 @@
     {% if summarise or article.metadata['summary'] or SUMMARY_MAX_LENGTH %}
       {{ article.summary }}
       <br>
-      <a class="btn" href="{{ SITEURL }}/{{ article.url }}#{{ article.slug }}">{{ _('Continue reading') }}</a>
+      <a class="btn" href="{{ SITEURL }}/{{ article.url }}{% if not DISABLE_HASH_URL %}#{{ article.slug }}{% endif %}">{{ _('Continue reading') }}</a>
     {% else %}
       {{ article.content }}
     {% endif %}