diff --git a/src/middleware/baseContext.js b/src/middleware/baseContext.js
index 617fb1f..e8cb659 100644
--- a/src/middleware/baseContext.js
+++ b/src/middleware/baseContext.js
@@ -2,7 +2,7 @@
 const getBaseContext = require("../utils/baseContext");
 
 module.exports = async function baseContextMiddleware(req, res, next) {
-  const isAuthenticated = !!req.isAuthenticated;
+  const isAuthenticated = req.isAuthenticated;
   const baseContext = await getBaseContext(isAuthenticated);
   res.locals.baseContext = baseContext;
 
diff --git a/src/middleware/errorHandler.js b/src/middleware/errorHandler.js
index e187198..6e8c677 100644
--- a/src/middleware/errorHandler.js
+++ b/src/middleware/errorHandler.js
@@ -38,7 +38,7 @@
   const errorContext = getErrorContext(code || statusCode);
 
   if (!isDev) {
-    res.redirect(`/error?code=${errorContext.statusCode}`);
+    // res.redirect(`/error?code=${errorContext.statusCode}`);
     return;
   }
 
diff --git a/src/utils/ConstructionRoutes.js b/src/utils/ConstructionRoutes.js
index d944bd3..f5e2fee 100644
--- a/src/utils/ConstructionRoutes.js
+++ b/src/utils/ConstructionRoutes.js
@@ -9,8 +9,8 @@
 
   register(path, title) {
     this.router.get(path, async (req, res) => {
-      const context = await getBaseContext({ title });
-      res.render("pages/construction.handlebars", context);
+      const context = { title };
+      res.renderWithBaseContext("pages/construction.handlebars", context);
     });
   }
 }
diff --git a/src/utils/MarkdownRoutes.js b/src/utils/MarkdownRoutes.js
index 7ca3345..9502c5c 100644
--- a/src/utils/MarkdownRoutes.js
+++ b/src/utils/MarkdownRoutes.js
@@ -21,11 +21,11 @@
         const fileContent = await fs.readFile(filePath, "utf8");
         const { data: frontmatter, content } = matter(fileContent);
         const htmlContent = marked(content);
-        const context = await getBaseContext({
+        const context = {
           title: frontmatter.title,
           content: htmlContent,
-        });
-        res.render(`pages/${handlebarsFile}`, context);
+        }
+        res.renderWithBaseContext(`pages/${handlebarsFile}`, context);
       } catch (err) {
         err.statusCode = 500;
         next(err);