diff --git a/resources/i18n/en.json b/resources/i18n/en.json
index 60b85b4f65..c7910d2192 100644
--- a/resources/i18n/en.json
+++ b/resources/i18n/en.json
@@ -1,13 +1,19 @@
 {
   "title": "DSpace",
-
   "nav": {
     "home": "Home"
   },
-
   "example": {
     "with": {
       "data": "{{greeting}}, {{recipient}}!"
     }
+  },
+
+  "404": {
+    "help": "We can't find the page you're looking for. The page may have been moved or deleted. You can use the button below to get back to the home page. ",
+    "page-not-found": "page not found",
+    "link": {
+      "home-page": "Take me to the home page"
+    }
   }
 }
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 0a7811118d..1186af1993 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -1,10 +1,12 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 
+import { PageNotFoundComponent } from './pagenotfound/pagenotfound.component';
 @NgModule({
   imports: [
     RouterModule.forChild([
-      { path: '', redirectTo: '/home', pathMatch: 'full' }
+      { path: '', redirectTo: '/home', pathMatch: 'full' },
+      { path: '**', pathMatch: 'full', component: PageNotFoundComponent},
     ])
   ],
 })
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index ead69d94f0..bdca6b73b2 100755
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,11 +1,13 @@
 import { NgModule } from '@angular/core';
 import { HomeModule } from './home/home.module';
 
+
 import { SharedModule } from './shared/shared.module';
 
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 import { HeaderComponent } from './header/header.component';
+import { PageNotFoundComponent } from './pagenotfound/pagenotfound.component';
 
 import { StoreModule } from "@ngrx/store";
 import { RouterStoreModule } from "@ngrx/router-store";
@@ -17,7 +19,8 @@ import { effects } from './app.effects';
 @NgModule({
   declarations: [
     AppComponent,
-    HeaderComponent
+    HeaderComponent,
+    PageNotFoundComponent
   ],
   imports: [
     SharedModule,
diff --git a/src/server.routes.ts b/src/server.routes.ts
index 38ff0049a5..02e79e563a 100644
--- a/src/server.routes.ts
+++ b/src/server.routes.ts
@@ -10,5 +10,5 @@
  * ];
  **/
 export const routes: string[] = [
-  'home'
+  'home', '**'
 ];