diff --git a/client/startup/startup.coffee b/client/startup/startup.coffee
index 1f3e3cf041bf9a3a4061305bc1cc5815a21f90af..f7043af49469bccef656de087027c9970acd8a41 100644
--- a/client/startup/startup.coffee
+++ b/client/startup/startup.coffee
@@ -31,6 +31,9 @@ Meteor.startup ->
 
 		if isRtl language
 			$('html').addClass "rtl"
+		else
+			$('html').removeClass "rtl"
+
 		language = language.split('-').shift()
 		TAPi18n.setLanguage(language)
 
diff --git a/packages/rocketchat-ui-master/master/main.coffee b/packages/rocketchat-ui-master/master/main.coffee
index 14ec9d986b25fe20dc93d0d4697fc24e092ceec1..a5896523f8a207399d5ed61a7a0632d2904a74e7 100644
--- a/packages/rocketchat-ui-master/master/main.coffee
+++ b/packages/rocketchat-ui-master/master/main.coffee
@@ -216,3 +216,5 @@ Template.main.onRendered ->
 	# RTL Support - Need config option on the UI
 	if isRtl localStorage.getItem "userLanguage"
 		$('html').addClass "rtl"
+	else
+		$('html').removeClass "rtl"