diff --git a/src/pages/NotFound.vue b/src/pages/NotFound.vue
index 410c16a81..f505edb32 100644
--- a/src/pages/NotFound.vue
+++ b/src/pages/NotFound.vue
@@ -32,6 +32,7 @@
                 <ul>
                     <li>{{ $t("Retype the address.") }}</li>
                     <li><a href="#" class="go-back" @click="goBack()">{{ $t("Go back to the previous page.") }}</a></li>
+                    <li><a href="/" class="go-back">Go back to home page.</a></li>
                 </ul>
             </div>
         </div>
diff --git a/src/pages/StatusPage.vue b/src/pages/StatusPage.vue
index fbcbf9e8e..dac9f94ad 100644
--- a/src/pages/StatusPage.vue
+++ b/src/pages/StatusPage.vue
@@ -551,6 +551,11 @@ export default {
 
             this.incident = res.data.incident;
             this.$root.publicGroupList = res.data.publicGroupList;
+        }).catch( function (error) {
+            if (error.response.status === 404) {
+                location.href = "/page-not-found";
+            }
+            console.log(error);
         });
 
         // 5mins a loop