diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee48d4882..0c9b70a91 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
v2.6.1 (FUTURE)
+## Enhancements
+
+* [#3281](https://github.com/digitalocean/netbox/issues/3281) - Hide custom links which render as empty text
+
## Bug Fixes
* [#3275](https://github.com/digitalocean/netbox/issues/3275) - Fix error when adding power outlets to a device type
diff --git a/netbox/extras/admin.py b/netbox/extras/admin.py
index a29d0df09..d93b04037 100644
--- a/netbox/extras/admin.py
+++ b/netbox/extras/admin.py
@@ -87,7 +87,8 @@ class CustomLinkForm(forms.ModelForm):
model = CustomLink
exclude = []
help_texts = {
- 'text': 'Jinja2 template code for the link text. Reference the object as {{ obj }}.',
+ 'text': 'Jinja2 template code for the link text. Reference the object as {{ obj }}. Links '
+ 'which render as empty text will not be displayed.',
'url': 'Jinja2 template code for the link URL. Reference the object as {{ obj }}.',
}
diff --git a/netbox/extras/templatetags/custom_links.py b/netbox/extras/templatetags/custom_links.py
index 193c465a5..ce6cc482a 100644
--- a/netbox/extras/templatetags/custom_links.py
+++ b/netbox/extras/templatetags/custom_links.py
@@ -15,7 +15,8 @@ GROUP_BUTTON = '