diff --git a/interface/interface.dm b/interface/interface.dm
index 9b87479a33..12712b77b6 100644
--- a/interface/interface.dm
+++ b/interface/interface.dm
@@ -67,7 +67,10 @@
 			return
 		var/static/issue_template = file2text(".github/ISSUE_TEMPLATE.md")
 		var/servername = CONFIG_GET(string/servername)
-		src << link("[githuburl]/issues/new[GLOB.round_id ? "?body=[url_encode("Issue reported from Round ID: [GLOB.round_id][servername ? " ([servername])" : ""]\n\n[issue_template]")]" : ""]")
+		var/href = issue_template
+		if(GLOB.round_id || servername)
+			href = "Issue reported from [GLOB.round_id ? " Round ID: [GLOB.round_id][servername ? " ([servername])" : ""]" : servername]\n\n[issue_template]"
+		DIRECT_OUTPUT(src, link("[githuburl]/issues/new?body=[url_encode(href)]"))
 	else
 		to_chat(src, "<span class='danger'>The Github URL is not set in the server configuration.</span>")
 	return