diff --git a/client/routes/pageNotFound.html b/client/routes/pageNotFound.html
new file mode 100644
index 000000000000..b0ab91242c6d
--- /dev/null
+++ b/client/routes/pageNotFound.html
@@ -0,0 +1,5 @@
+<template name="pageNotFound">
+  <h1>{{_ "Error_404"}}</h1>
+  <h3>{{_ "Oops_page_not_found"}}</h3>
+  <p>{{_ "Sorry_page_you_requested_does_not_exists_or_was_deleted"}}</p>
+</template>
diff --git a/client/routes/router.js b/client/routes/router.js
index 67d0f4870e5e..c3cb3e545735 100644
--- a/client/routes/router.js
+++ b/client/routes/router.js
@@ -148,3 +148,10 @@ FlowRouter.route('/register/:hash', {
 		// 	BlazeLayout.render 'logoLayout', { render: 'invalidSecretURL' }
 	}
 });
+
+FlowRouter.notFound = {
+	action() {
+		BlazeLayout.render('pageNotFound');
+	}
+};
+
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 793fd1f1703d..e13d78a4a596 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -632,6 +632,9 @@
   "Enter_Normal": "Normal mode (send with Enter)",
   "Enter_to": "Enter to",
   "Error": "Error",
+  "Error_404": "Error:404",
+  "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances": "Error: Rocket.Chat requires oplog tailing when running in multiple instances",
+  "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances_details": "Please make sure your MongoDB is on ReplicaSet mode and MONGO_OPLOG_URL environment variable is defined correctly on the application server",
   "error-action-not-allowed": "__action__ is not allowed",
   "error-application-not-found": "Application not found",
   "error-archived-duplicate-name": "There's an archived channel with name '__room_name__'",
@@ -1461,6 +1464,8 @@
   "Opens_a_channel_group_or_direct_message": "Opens a channel, group or direct message",
   "optional": "optional",
   "or": "or",
+  "Oops_page_not_found": "Oops, page not found",
+  "Open_your_authentication_app_and_enter_the_code": "Open your authentication app and enter the code. You can also use one of your backup codes.",
   "Or_talk_as_anonymous": "Or talk as anonymous",
   "Order": "Order",
   "Original": "Original",
@@ -1821,6 +1826,7 @@
   "Snippet_Added": "Created on %s",
   "Snippet_Messages": "Snippet Messages",
   "Snippeted_a_message": "Created a snippet __snippetLink__",
+  "Sorry_page_you_requested_does_not_exists_or_was_deleted": "Sorry, page you requested does not exists or was deleted!",
   "Sort_by_activity": "Sort by Activity",
   "Sound": "Sound",
   "Sound_File_mp3": "Sound File (mp3)",