diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index b66c632cbadda..fe1b9a24139d2 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -642,6 +642,7 @@
   "Do_not_display_unread_counter": "Do not display any counter of this channel",
   "Do_you_want_to_accept": "Do you want to accept?",
   "Do_you_want_to_change_to_s_question": "Do you want to change to <strong>%s</strong>?",
+  "Document_Domain":"Document Domain",
   "Domain": "Domain",
   "Domain_added": "domain Added",
   "Domain_removed": "Domain Removed",
diff --git a/packages/rocketchat-lib/client/lib/settings.js b/packages/rocketchat-lib/client/lib/settings.js
index 5614cf2b7c1ee..75fc90c9e63c3 100644
--- a/packages/rocketchat-lib/client/lib/settings.js
+++ b/packages/rocketchat-lib/client/lib/settings.js
@@ -82,6 +82,10 @@ Meteor.startup(function() {
 				});
 			}
 		}, 100);
+		const documentDomain = RocketChat.settings.get('Document_Domain');
+		if (documentDomain) {
+			window.document.domain = documentDomain;
+		}
 		return c.stop();
 	});
 });
diff --git a/packages/rocketchat-lib/server/startup/settings.js b/packages/rocketchat-lib/server/startup/settings.js
index 631baea30122d..e50cf8d7f838b 100644
--- a/packages/rocketchat-lib/server/startup/settings.js
+++ b/packages/rocketchat-lib/server/startup/settings.js
@@ -707,6 +707,10 @@ RocketChat.settings.addGroup('General', function() {
 			order: 0
 		}
 	});
+	this.add('Document_Domain', '', {
+		type: 'string',
+		'public': true
+	});
 	this.add('Language', '', {
 		type: 'language',
 		wizard: {