diff --git a/app/ui/client/views/404/roomNotFound.html b/app/ui/client/views/404/roomNotFound.html
index 036ca2046c52a..ccb7647e71605 100644
--- a/app/ui/client/views/404/roomNotFound.html
+++ b/app/ui/client/views/404/roomNotFound.html
@@ -1,10 +1,10 @@
 <template name="roomNotFound">
 	<section class="page-container page-list content-background-color">
-		{{> header sectionName="Room_not_found"}}
-		<div class="content room-not-found error-color">
-			<i class="icon-attention"></i>
-			<div>
-				{{#with data}}
+		{{#with data}}
+			{{> header sectionName=headerMessage}}
+			<div class="content room-not-found error-color">
+				<i class="icon-attention"></i>
+				<div>
 					{{#if $eq type 'c'}}
 						{{{_ 'No_channel_with_name_%s_was_found' name}}}
 					{{/if}}
@@ -22,8 +22,8 @@
 							{{/if}}
 						{{/if}}
 					{{/if}}
-				{{/with}}
+				</div>
 			</div>
-		</div>
+		{{/with}}
 	</section>
 </template>
diff --git a/app/ui/client/views/404/roomNotFound.js b/app/ui/client/views/404/roomNotFound.js
index da7ebe9704ca9..c709d9133b89f 100644
--- a/app/ui/client/views/404/roomNotFound.js
+++ b/app/ui/client/views/404/roomNotFound.js
@@ -20,4 +20,9 @@ Template.roomNotFound.helpers({
 	customErrorMessage() {
 		return this.error.reason;
 	},
+	headerMessage() {
+		const { type } = Template.currentData();
+
+		return type === 'd' ? 'User_not_found' : 'Room_not_found';
+	},
 });