diff --git a/render.go b/render.go
index 025bfe9..31e9126 100644
--- a/render.go
+++ b/render.go
@@ -156,9 +156,6 @@ func initRendering() error {
 			}
 			return parsed
 		},
-		"commentsenabled": func(blog *configBlog) bool {
-			return blog.Comments != nil && blog.Comments.Enabled
-		},
 		"mentions": func(absolute string) []*mention {
 			mentions, _ := getWebmentions(&webmentionsRequestConfig{
 				target: absolute,
@@ -193,11 +190,12 @@ func initRendering() error {
 }
 
 type renderData struct {
-	BlogString string
-	Canonical  string
-	Blog       *configBlog
-	Data       interface{}
-	LoggedIn   bool
+	BlogString      string
+	Canonical       string
+	Blog            *configBlog
+	Data            interface{}
+	LoggedIn        bool
+	CommentsEnabled bool
 }
 
 func render(w http.ResponseWriter, r *http.Request, template string, data *renderData) {
@@ -225,6 +223,8 @@ func render(w http.ResponseWriter, r *http.Request, template string, data *rende
 	if loggedIn, ok := r.Context().Value(loggedInKey).(bool); ok && loggedIn {
 		data.LoggedIn = true
 	}
+	// Check if comments enabled
+	data.CommentsEnabled = data.Blog.Comments != nil && data.Blog.Comments.Enabled
 	// Minify and write response
 	mw := minifier.Writer(contentTypeHTML, w)
 	defer func() {
diff --git a/templates/comment.gohtml b/templates/comment.gohtml
index 9d3515e..38a1fb1 100644
--- a/templates/comment.gohtml
+++ b/templates/comment.gohtml
@@ -13,7 +13,7 @@
       {{ html .Data.Comment }}
     </p>
   </main>
-  {{ if commentsenabled .Blog }}
+  {{ if .CommentsEnabled }}
     {{ include "interactions" . }}
   {{ end }}
 {{ end }}
diff --git a/templates/header.gohtml b/templates/header.gohtml
index e6eea14..f72adb3 100644
--- a/templates/header.gohtml
+++ b/templates/header.gohtml
@@ -12,7 +12,7 @@
           <a href="{{ blogrelative .Blog "/editor" }}">{{ string .Blog.Lang "editor" }}</a>
           &bull; <a href="/notifications">{{ string .Blog.Lang "notifications" }}</a>
           &bull; <a href="/webmention">{{ string .Blog.Lang "webmentions" }}</a>
-          &bull; <a href="{{ blogrelative .Blog "/comment" }}">{{ string .Blog.Lang "comments" }}</a>
+          {{ if .CommentsEnabled }}&bull; <a href="{{ blogrelative .Blog "/comment" }}">{{ string .Blog.Lang "comments" }}</a>{{ end }}
           &bull; <a href="/logout">{{ string .Blog.Lang "logout" }}</a>
         </nav>
       {{ end }}
diff --git a/templates/post.gohtml b/templates/post.gohtml
index cdfe6ea..9e42270 100644
--- a/templates/post.gohtml
+++ b/templates/post.gohtml
@@ -41,7 +41,7 @@
       </form>
     </div>
   {{ end }}
-  {{ if commentsenabled .Blog }}
+  {{ if .CommentsEnabled }}
     {{ include "interactions" . }}
   {{ end }}
 {{ end }}