diff --git a/server/controllers/common.js b/server/controllers/common.js
index de64eb57..052c3757 100644
--- a/server/controllers/common.js
+++ b/server/controllers/common.js
@@ -525,19 +525,13 @@ router.get('/*', async (req, res, next) => {
           }
 
           // -> Inject comments variables
-          const shouldDisplayComments = WIKI.config.features.featurePageComments && WIKI.data.commentProvider.codeTemplate
-          const commentTmpl = shouldDisplayComments ? {
+          const commentTmpl = {
             codeTemplate: WIKI.data.commentProvider.codeTemplate,
             head: WIKI.data.commentProvider.head,
             body: WIKI.data.commentProvider.body,
             main: WIKI.data.commentProvider.main
-          } : {
-            codeTemplate: false,
-            head: null,
-            body: null,
-            main: ''
           }
-          if (shouldDisplayComments) {
+          if (WIKI.config.features.featurePageComments && WIKI.data.commentProvider.codeTemplate) {
             [
               { key: 'pageUrl', value: `${WIKI.config.host}/i/${page.id}` },
               { key: 'pageId', value: page.id }