diff --git a/indianpong/pong/templates/404.html b/indianpong/pong/templates/404.html
index 60efaac..ffa4292 100644
--- a/indianpong/pong/templates/404.html
+++ b/indianpong/pong/templates/404.html
@@ -5,7 +5,7 @@
 
 {% block app %}
 <div class="HeaderArea" id="HeaderArea">
-    <div class="big-text">{{context.notFoundHeaderText}}</div>
+    <div class="big-text">404 ERROR</div>
     <div class="small-text">{{context.notFoundSubHeaderText}}</div>
     <div class="gohome-button-container">
         <a onclick="swapApp('/')"><button class="gohome-button" type="button">
diff --git a/indianpong/static/js/navigation.js b/indianpong/static/js/navigation.js
index 51f439a..9c812c5 100644
--- a/indianpong/static/js/navigation.js
+++ b/indianpong/static/js/navigation.js
@@ -32,7 +32,9 @@ function updateApp(path) {
     .then(response => response.text())
     .then(html => {
       document.body.innerHTML = html;
-      pageHandler(path);
+      if (!html.includes('<div class="big-text">404 ERROR</div>')) {
+          pageHandler(path);
+      }
       hideLoadingScreen();
     })
     .catch(error => console.error(error));