diff --git a/src/.vuepress/config.js b/src/.vuepress/config.js
index 88dba8e2..271e0754 100644
--- a/src/.vuepress/config.js
+++ b/src/.vuepress/config.js
@@ -138,6 +138,7 @@ module.exports = {
       {
         normalSuffix: '/',
         indexSuffix: '/',
+        notFoundPath: '/ipfs-404.html',
       },
     ],
     [
@@ -175,7 +176,7 @@ module.exports = {
         sitemap: {
           hostname: CANONICAL_BASE,
           changefreq: 'weekly',
-          exclude: ['/image-crop/', '/404.html'],
+          exclude: ['/image-crop/', '/ipfs-404.html'],
         },
         directories: [
           {
diff --git a/src/.vuepress/public/ipfs-404.html b/src/.vuepress/public/ipfs-404.html
deleted file mode 100644
index 5760c39e..00000000
--- a/src/.vuepress/public/ipfs-404.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head>
-    <title>IPFS Blog &amp; News</title>
-</head>
-<body>
-    <script>
-        window.location.pathname = '/404.html'
-    </script>
-</body>
-</html>
diff --git a/src/.vuepress/theme/layouts/NotFound.vue b/src/.vuepress/theme/layouts/NotFound.vue
index 14cbb88a..d2714fe8 100644
--- a/src/.vuepress/theme/layouts/NotFound.vue
+++ b/src/.vuepress/theme/layouts/NotFound.vue
@@ -16,12 +16,24 @@
 
 <script>
 import Layout from '@theme/layouts/Layout.vue'
+import countly from '../util/countly'
 
 export default {
   name: 'NotFound',
   components: {
     Layout,
   },
+  created() {
+    if (typeof this.$ssrContext !== 'undefined') {
+      this.$ssrContext.userHeadTags += `<base href="/" />`
+    }
+  },
+  mounted() {
+    countly.trackEvent(countly.events.NOT_FOUND, {
+      path: this.$route.path,
+      referrer: typeof window !== 'undefined' ? document.referrer : null,
+    })
+  },
 }
 </script>
 
diff --git a/src/.vuepress/theme/util/countly.js b/src/.vuepress/theme/util/countly.js
index b6e639e8..7edf936b 100644
--- a/src/.vuepress/theme/util/countly.js
+++ b/src/.vuepress/theme/util/countly.js
@@ -8,6 +8,7 @@ export const events = {
   LOAD_MORE_BUTTON: 'loadMoreButton',
   NEWSLETTER_SUBSCRIBE: 'newsletterSubscribe',
   FILTER: 'filter',
+  NOT_FOUND: '404NotFound',
 }
 /*
   Load Countly script.
