diff --git a/packages/rocketchat-ui/client/components/icon.js b/packages/rocketchat-ui/client/components/icon.js
index 7797ab8719355..c16c92c2c1c8d 100644
--- a/packages/rocketchat-ui/client/components/icon.js
+++ b/packages/rocketchat-ui/client/components/icon.js
@@ -1,5 +1,7 @@
 /* globals isFirefox */
 
-const baseUrl = isFirefox && isFirefox[1] < 55 ? () => `${ window.location.origin }${ FlowRouter.current().path }` : () => '';
+const firefoxBaseUrlFix = () => `${ window.location.origin }${ FlowRouter.current().path }`;
 
-Template.icon.helpers({ baseUrl });
+Template.icon.helpers({
+	baseUrl: isFirefox && isFirefox[1] < 55 ? firefoxBaseUrlFix : undefined
+});