diff --git a/docs/release-notes/version-3.5.md b/docs/release-notes/version-3.5.md
index e36a1f3b4..1154d4fcd 100644
--- a/docs/release-notes/version-3.5.md
+++ b/docs/release-notes/version-3.5.md
@@ -2,6 +2,10 @@
 
 ## v3.5.3 (FUTURE)
 
+### Bug Fixes
+
+* [#12694](https://github.com/netbox-community/netbox/issues/12694) - Strip leading & trailing whitespace from custom link URL & text
+
 ---
 
 ## v3.5.2 (2023-05-22)
diff --git a/netbox/extras/models/models.py b/netbox/extras/models/models.py
index 16e4fb577..9433ab6b0 100644
--- a/netbox/extras/models/models.py
+++ b/netbox/extras/models/models.py
@@ -274,10 +274,10 @@ class CustomLink(CloningMixin, ExportTemplatesMixin, ChangeLoggedModel):
 
         :param context: The context passed to Jinja2
         """
-        text = render_jinja2(self.link_text, context)
+        text = render_jinja2(self.link_text, context).strip()
         if not text:
             return {}
-        link = render_jinja2(self.link_url, context)
+        link = render_jinja2(self.link_url, context).strip()
         link_target = ' target="_blank"' if self.new_window else ''
 
         # Sanitize link text