diff --git a/packages/rocketchat-livechat/app/client/views/livechatWindow.js b/packages/rocketchat-livechat/app/client/views/livechatWindow.js
index c4242d72039..2cd28637b5b 100644
--- a/packages/rocketchat-livechat/app/client/views/livechatWindow.js
+++ b/packages/rocketchat-livechat/app/client/views/livechatWindow.js
@@ -64,6 +64,17 @@ Template.livechatWindow.onCreated(function() {
 
 	Session.set({sound: true});
 
+	const defaultAppLanguage = () => {
+		let lng = window.navigator.userLanguage || window.navigator.language || 'en';
+		let regexp = /([a-z]{2}-)([a-z]{2})/;
+		if (regexp.test(lng)) {
+			lng = lng.replace(regexp, function(match, ...parts) {
+				return parts[0] + parts[1].toUpperCase();
+			});
+		}
+		return lng;
+	};
+
 	// get all needed live chat info for the user
 	Meteor.call('livechat:getInitialData', visitor.getToken(), (err, result) => {
 		if (err) {
@@ -94,6 +105,8 @@ Template.livechatWindow.onCreated(function() {
 				visitor.setRoom(result.room._id);
 			}
 
+			TAPi18n.setLanguage((result.language || defaultAppLanguage()).split('-').shift());
+
 			Triggers.setTriggers(result.triggers);
 			Triggers.init();
 
diff --git a/packages/rocketchat-livechat/app/client/views/messages.html b/packages/rocketchat-livechat/app/client/views/messages.html
index 08bbea2bcb3..15d8e58821b 100644
--- a/packages/rocketchat-livechat/app/client/views/messages.html
+++ b/packages/rocketchat-livechat/app/client/views/messages.html
@@ -8,7 +8,7 @@
 			</ul>
 		</div>
 		<div class="new-message not">
-			<span>New messages</span>
+			<span>{{_ "New_messages"}}</span>
 		</div>
 
 		<div class="error">
@@ -17,11 +17,11 @@
 	</div>
 	<div class="footer">
 		<div class="input-wrapper">
-			<textarea class="input-message" placeholder="Type your message"></textarea>
+			<textarea class="input-message" placeholder="{{_ "Type_your_message"}}"></textarea>
 		</div>
 		<i class="send-button icon-paper-plane" aria-label="{{_ "Send"}}"></i>
 		<p class="powered-by">
-			Powered by
+			{{_ "Powered_by"}}
 			<a href="https://rocket.chat" target="_blank">
 				<img class="logo" src="/images/logo/logo-dark.svg?v=1">
 			</a>
diff --git a/packages/rocketchat-livechat/app/i18n/en.i18n.json b/packages/rocketchat-livechat/app/i18n/en.i18n.json
index e116449e42d..eb91f91a9e1 100644
--- a/packages/rocketchat-livechat/app/i18n/en.i18n.json
+++ b/packages/rocketchat-livechat/app/i18n/en.i18n.json
@@ -7,8 +7,10 @@
   "How_responsive_was_the_chat_agent" : "How responsive was the chat agent?",
   "How_satisfied_were_you_with_this_chat" : "How satisfied were you with this chat?",
   "Installation" : "Installation",
+  "New_messages" : "New messages",
   "Please_answer_survey" : "Please take a moment to answer a quick survey about this chat",
   "Please_fill_name_and_email" : "Please fill name and email",
+  "Powered_by": "Powered by",
   "Select_a_department" : "Select a department",
   "Send" : "Send",
   "Skip" : "Skip",
@@ -24,4 +26,4 @@
   "User_left" : "User left",
   "We_are_offline_Sorry_for_the_inconvenience" : "We are offline. Sorry for the inconvenience.",
   "You_must_complete_all_fields" : "You must complete all fields"
-}
\ No newline at end of file
+}
diff --git a/packages/rocketchat-livechat/server/lib/Livechat.js b/packages/rocketchat-livechat/server/lib/Livechat.js
index db2f3bd0c10..b55895b0ea0 100644
--- a/packages/rocketchat-livechat/server/lib/Livechat.js
+++ b/packages/rocketchat-livechat/server/lib/Livechat.js
@@ -219,7 +219,8 @@ RocketChat.Livechat = {
 			'Livechat_offline_message',
 			'Livechat_offline_success_message',
 			'Livechat_offline_form_unavailable',
-			'Livechat_display_offline_form'
+			'Livechat_display_offline_form',
+			'Language'
 		]).forEach((setting) => {
 			settings[setting._id] = setting.value;
 		});
diff --git a/packages/rocketchat-livechat/server/methods/getInitialData.js b/packages/rocketchat-livechat/server/methods/getInitialData.js
index f73e1b4d7f9..096f1c408b5 100644
--- a/packages/rocketchat-livechat/server/methods/getInitialData.js
+++ b/packages/rocketchat-livechat/server/methods/getInitialData.js
@@ -43,6 +43,7 @@ Meteor.methods({
 		info.offlineSuccessMessage = initSettings.Livechat_offline_success_message;
 		info.offlineUnavailableMessage = initSettings.Livechat_offline_form_unavailable;
 		info.displayOfflineForm = initSettings.Livechat_display_offline_form;
+		info.language = initSettings.Language;
 
 		RocketChat.models.LivechatTrigger.find().forEach((trigger) => {
 			info.triggers.push(trigger);