diff --git a/addons/link_tracker/models/link_tracker.py b/addons/link_tracker/models/link_tracker.py
index 41cf759be6a..715e789e699 100644
--- a/addons/link_tracker/models/link_tracker.py
+++ b/addons/link_tracker/models/link_tracker.py
@@ -69,7 +69,7 @@ class LinkTracker(models.Model):
     @api.depends('code')
     def _compute_short_url(self):
         for tracker in self:
-            tracker.short_url = urls.url_join(tracker.get_base_url(), '/r/%(code)s' % {'code': tracker.code})
+            tracker.short_url = urls.url_join(tracker.short_url_host, '%(code)s' % {'code': tracker.code})
 
     def _compute_short_url_host(self):
         for tracker in self:
diff --git a/addons/website_links/models/link_tracker.py b/addons/website_links/models/link_tracker.py
index 82790bdd59e..80f7b0b1e44 100644
--- a/addons/website_links/models/link_tracker.py
+++ b/addons/website_links/models/link_tracker.py
@@ -3,6 +3,9 @@
 
 from odoo import models, _
 
+from werkzeug import urls
+
+
 class LinkTracker(models.Model):
     _inherit = ['link.tracker']
 
@@ -13,3 +16,8 @@ class LinkTracker(models.Model):
             'url': '%s+' % (self.short_url),
             'target': 'new',
         }
+
+    def _compute_short_url_host(self):
+        for tracker in self:
+            base_url = self.env['website'].get_current_website().get_base_url()
+            tracker.short_url_host = urls.url_join(base_url, '/r/')