diff --git a/public/js/config.js b/public/js/config.js
index 2d07439..65028fd 100755
--- a/public/js/config.js
+++ b/public/js/config.js
@@ -26,7 +26,7 @@ angular.module('insight').config(['$routeProvider',
       templateUrl: 'views/status.html'
     }).
     otherwise({
-      redirectTo: '/'
+      templateUrl: 'views/404.html'
     });
   }
 ]);
diff --git a/public/views/404.html b/public/views/404.html
new file mode 100644
index 0000000..f056178
--- /dev/null
+++ b/public/views/404.html
@@ -0,0 +1,5 @@
+<div class="jumbotron">
+  <h1>Ooops!</h1>
+  <h2 class="text-muted">Page not found :(</h2>
+  <p><a href="/" class="pull-right">Go to home</a></p>
+</div>