diff --git a/packages/rocketchat-lib/client/lib/RestApiClient.js b/packages/rocketchat-lib/client/lib/RestApiClient.js
index 490d9c7c57a..7226be0360d 100644
--- a/packages/rocketchat-lib/client/lib/RestApiClient.js
+++ b/packages/rocketchat-lib/client/lib/RestApiClient.js
@@ -44,7 +44,7 @@ RocketChat.API = {
 		return new Promise(function _rlRestApiGet(resolve, reject) {
 			jQuery.ajax({
 				method,
-				url: `${ window.location.origin }/api/${ endpoint }${ query }`,
+				url: `${ document.baseURI }api/${ endpoint }${ query }`,
 				headers: {
 					'Content-Type': 'application/json',
 					'X-User-Id': localStorage['Meteor.userId'],
@@ -72,7 +72,7 @@ RocketChat.API = {
 
 		return new Promise(function _jqueryFormDataPromise(resolve, reject) {
 			jQuery.ajax({
-				url: `${ window.location.origin }/api/${ endpoint }${ query }`,
+				url: `${ document.baseURI }api/${ endpoint }${ query }`,
 				headers: {
 					'X-User-Id': localStorage['Meteor.userId'],
 					'X-Auth-Token': localStorage['Meteor.loginToken'],
diff --git a/packages/rocketchat-ui/client/components/icon.js b/packages/rocketchat-ui/client/components/icon.js
index 21b04f751d0..b7072d1abec 100644
--- a/packages/rocketchat-ui/client/components/icon.js
+++ b/packages/rocketchat-ui/client/components/icon.js
@@ -2,7 +2,7 @@ import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
 import { isChrome, isFirefox } from 'meteor/rocketchat:utils';
 
-const baseUrlFix = () => `${ window.location.origin }${ FlowRouter.current().path }`;
+const baseUrlFix = () => `${ document.baseURI }${ FlowRouter.current().path.substring(1) }`;
 
 Template.icon.helpers({
 	baseUrl: ((isFirefox && isFirefox[1] < 55) || (isChrome && isChrome[1] < 55)) ? baseUrlFix : undefined,