diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 1dcf6b05..cd5c775f 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -57,6 +57,7 @@ import { TracengPreferencesComponent } from './components/preferences/traceng/tr
 import { TracengTemplatesComponent } from './components/preferences/traceng/traceng-templates/traceng-templates.component';
 import { AddTracengTemplateComponent } from './components/preferences/traceng/add-traceng/add-traceng-template.component';
 import { TracengTemplateDetailsComponent } from './components/preferences/traceng/traceng-template-details/traceng-template-details.component';
+import { PageNotFoundComponent } from './components/page-not-found/page-not-found.component';
 
 const routes: Routes = [
   {
@@ -128,15 +129,15 @@ const routes: Routes = [
       { path: 'server/:server_id/preferences/iou/templates', component: IouTemplatesComponent },
       { path: 'server/:server_id/preferences/iou/templates/:template_id', component: IouTemplateDetailsComponent },
       { path: 'server/:server_id/preferences/iou/templates/:template_id/copy', component: CopyIouTemplateComponent },
-      { path: 'server/:server_id/preferences/iou/addtemplate', component: AddIouTemplateComponent }
+      { path: 'server/:server_id/preferences/iou/addtemplate', component: AddIouTemplateComponent },
+      {
+        path: '**',
+        component: PageNotFoundComponent
+      }
     ]
   },
   { 
     path: 'server/:server_id/project/:project_id', component: ProjectMapComponent,
-  },
-  {
-    path: '**',
-    redirectTo: 'servers'
   }
 ];
 
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 7f99791d..33c35af8 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -245,6 +245,7 @@ import { ScreenshotDialogComponent } from './components/project-map/screenshot-d
 import { ResizableModule } from 'angular-resizable-element';
 import { DragAndDropModule } from 'angular-draggable-droppable';
 import { DragDropModule } from '@angular/cdk/drag-drop';
+import { PageNotFoundComponent } from './components/page-not-found/page-not-found.component';
 
 if (environment.production) {
   Raven.config('https://b2b1cfd9b043491eb6b566fd8acee358@sentry.io/842726', {
@@ -412,7 +413,8 @@ if (environment.production) {
     StartCaptureOnStartedLinkActionComponent,
     LockActionComponent,
     NavigationDialogComponent,
-    ScreenshotDialogComponent
+    ScreenshotDialogComponent,
+    PageNotFoundComponent
   ],
   imports: [
     BrowserModule,
diff --git a/src/app/components/page-not-found/page-not-found.component.html b/src/app/components/page-not-found/page-not-found.component.html
new file mode 100644
index 00000000..9e68e1ba
--- /dev/null
+++ b/src/app/components/page-not-found/page-not-found.component.html
@@ -0,0 +1,6 @@
+<div class="content">
+    <div class="default-header">
+        <h1>404 Page not found</h1>
+        <button mat-button routerLink="/servers">Navigate to homepage</button>
+    </div>
+</div>
diff --git a/src/app/components/page-not-found/page-not-found.component.scss b/src/app/components/page-not-found/page-not-found.component.scss
new file mode 100644
index 00000000..b3dfebed
--- /dev/null
+++ b/src/app/components/page-not-found/page-not-found.component.scss
@@ -0,0 +1,3 @@
+div {
+    text-align: center
+}
diff --git a/src/app/components/page-not-found/page-not-found.component.spec.ts b/src/app/components/page-not-found/page-not-found.component.spec.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/src/app/components/page-not-found/page-not-found.component.ts b/src/app/components/page-not-found/page-not-found.component.ts
new file mode 100644
index 00000000..ec0871c7
--- /dev/null
+++ b/src/app/components/page-not-found/page-not-found.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+    selector: 'app-page-not-found',
+    templateUrl: './page-not-found.component.html',
+    styleUrls: ['./page-not-found.component.scss']
+})
+export class PageNotFoundComponent {
+    constructor(){}
+}