diff --git a/theme/templates/macros/link.html b/theme/templates/macros/link.html
index ac9a323acbfda5e35ce64deb17490ffd03488631..ac6d21f723436d16241d20b49d5667e0dfa4fb5a 100644
--- a/theme/templates/macros/link.html
+++ b/theme/templates/macros/link.html
@@ -34,7 +34,9 @@
 			{%- set ns.relation = "external" -%}
 		{%- else -%}
 			{%- set ns.relation = "internal" -%}
-			{%- set ns.url = [siteurl, ns.url]|join("/") -%}
+			{%- if resolvedlink.url|length -%}
+				{%- set ns.url = [siteurl, ns.url]|join("/") -%}
+			{%- endif -%}
 		{%- endif -%}
 		{%- set target = config.link_target[ns.relation] -%}
 		<a {{ content_renderer.render_attr(attr, lang, extra_classes=[ns.relation], extra={"href": ns.url, "title": {"value":title, "escape": true}, "target": target}) }}>
@@ -42,11 +44,7 @@
 				{%- if content is string and content|length -%}
 					{{ renderm.softbreak_span(content) }}
 				{%- else -%}
-					{%- if objtype == "tag" -%}
-						{{ renderm.softbreak_span(obj.title) }}
-					{%- elif objtype == "slug" -%}
-						{{ renderm.softbreak_span(obj.title) }}
-					{%- endif -%}
+					{{ renderm.softbreak_span(obj.title) }}
 				{%- endif -%}
 			{%- else -%}
 				{{ content_renderer.render_blocks_or_inlines(content, lang) }}