diff --git a/src/partials/head-info.hbs b/src/partials/head-info.hbs
index 3f616cfd..bb484ba4 100644
--- a/src/partials/head-info.hbs
+++ b/src/partials/head-info.hbs
@@ -1,10 +1,11 @@
-    {{#unless (ne page.attributes.no-canonical undefined)}}
     {{#if page.canonicalUrl}}
+    {{#with page.canonicalUrl}}
     <link rel="canonical" href="{{{this}}}">
+    {{/with}}
     {{else}}
     <link rel="canonical" href="https://neo4j.com{{{ page.attributes.canonical-root }}}{{ page.url }}">
     {{/if}}
-    {{/unless}}
+
     {{#unless (eq page.attributes.pagination undefined)}}
     {{#with page.previous}}
     <link rel="prev" href="{{{relativize ./url}}}">
@@ -13,6 +14,7 @@
     <link rel="next" href="{{{relativize ./url}}}">
     {{/with}}
     {{/unless}}
+
     {{#with page.description}}
       <meta name="description" content="{{this}}">
     {{/with}}